Merge pull request #94 from crazy-max/alpine-3.21

Alpine Linux 3.21
crazy-max · Dec 23, 2024 · c6cd78d · c6cd78d
2 parents 3f721ba + 27819fd
commit c6cd78d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,20 +25,20 @@ env:
   GHCR_SLUG: ghcr.io/crazy-max/alpine-s6
   DOCKERHUB_DIST_SLUG: crazymax/alpine-s6-dist
   GHCR_DIST_SLUG: ghcr.io/crazy-max/alpine-s6-dist
-  ALPINE_LATEST: '3.20'
+  ALPINE_LATEST: '3.21'
 
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
         alpine_version:
-          - '3.15'
           - '3.16'
           - '3.17'
           - '3.18'
           - '3.19'
           - '3.20'
+          - '3.21'
           - 'edge'
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -27,12 +27,12 @@ jobs:
           - legacy-pureftpd
           - legacy-rrdtool
         alpine_version:
-          - '3.15'
           - '3.16'
           - '3.17'
           - '3.18'
           - '3.19'
           - '3.20'
+          - '3.21'
           - 'edge'
     runs-on: ubuntu-latest
     steps:

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 ARG ALPINE_VERSION="latest"
-ARG XX_VERSION="1.5.0"
+ARG XX_VERSION="1.6.1"
 
 ARG S6_OVERLAY_VERSION="3.2.0.0"
 ARG S6_OVERLAY_REF="e2738d136bbdedbe3553b947f3c18183fc70e56c"

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -10,7 +10,7 @@ target "args" {
 }
 
 target "platforms" {
-  platforms = ALPINE_VERSION == "3.20" || ALPINE_VERSION == "latest" || ALPINE_VERSION == "edge" ? [
+  platforms = ALPINE_VERSION == "3.21" || ALPINE_VERSION == "3.20" || ALPINE_VERSION == "latest" || ALPINE_VERSION == "edge" ? [
     "linux/386",
     "linux/amd64",
     "linux/arm64",