From e9a8c13f9d65e747eed29634f5a5bfb8c110cdff Mon Sep 17 00:00:00 2001
From: Mexit <25229673+Mexit@users.noreply.github.com>
Date: Mon, 15 May 2023 18:10:39 +0200
Subject: [PATCH] Alpine Linux updated to 3.18

---
 .github/workflows/build_iso.yml | 4 ++--
 genapkovl-docker.sh             | 4 +---
 mkimg.docker.sh                 | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index 322b9bd..b1defe2 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -1,5 +1,5 @@
 env:
-  version: v3.17
+  version: v3.18
 
 name: Alpine ISO Builder
 
@@ -12,7 +12,7 @@ jobs:
   build_ISOs:
     runs-on: ubuntu-22.04
     container:
-      image: alpine:3.17
+      image: alpine:3.18
 
     steps:
       - uses: actions/checkout@v3
diff --git a/genapkovl-docker.sh b/genapkovl-docker.sh
index 1ed2765..3fdf8e7 100644
--- a/genapkovl-docker.sh
+++ b/genapkovl-docker.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-version="v3.17"
+version="v3.18"
 
 HOSTNAME="$1"
 if [ -z "$HOSTNAME" ]; then
@@ -50,8 +50,6 @@ bash-completion
 coreutils
 docker
 docker-bash-completion
-docker-compose
-docker-compose-bash-completion
 docker-cli-compose
 findutils
 openssh
diff --git a/mkimg.docker.sh b/mkimg.docker.sh
index ab5a7d5..61fbbf2 100644
--- a/mkimg.docker.sh
+++ b/mkimg.docker.sh
@@ -8,7 +8,7 @@ profile_docker() {
 	output_format="iso"
 	kernel_addons="xtables-addons"
 	apks="$apks \
-		docker docker-bash-completion docker-compose docker-compose-bash-completion docker-cli-compose \
+		docker docker-bash-completion docker-cli-compose \
 		bash-completion procps util-linux readline findutils sed coreutils sudo e2fsprogs lvm2"
 	apkovl="genapkovl-docker.sh"
 }