Merge pull request #81 from crazy-max/alpine320

Alpine Linux 3.20
crazy-max · May 26, 2024 · e5bbf75 · e5bbf75
2 parents 35879df + 39d6a30
commit e5bbf75
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,21 +25,21 @@ 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.19
+  ALPINE_LATEST: 3.20
 
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
         alpine_version:
-          - 3.14
-          - 3.15
-          - 3.16
-          - 3.17
-          - 3.18
-          - 3.19
-          - edge
+          - '3.15'
+          - '3.16'
+          - '3.17'
+          - '3.18'
+          - '3.19'
+          - '3.20'
+          - 'edge'
     runs-on: ubuntu-latest
     steps:
       -
@@ -110,7 +110,7 @@ jobs:
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
         with:
-          config-inline: |
+          buildkitd-config-inline: |
             [worker.oci]
               max-parallelism = 4
       -

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -27,13 +27,13 @@ jobs:
           - legacy-pureftpd
           - legacy-rrdtool
         alpine_version:
-          - 3.14
-          - 3.15
-          - 3.16
-          - 3.17
-          - 3.18
-          - 3.19
-          - edge
+          - '3.15'
+          - '3.16'
+          - '3.17'
+          - '3.18'
+          - '3.19'
+          - '3.20'
+          - '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.3.0"
+ARG XX_VERSION="1.4.0"
 
 ARG S6_OVERLAY_VERSION="3.1.5.0"
 ARG S6_OVERLAY_REF="9eda003e19a6e01edd951ad84dd50a4804129d73"

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -10,7 +10,16 @@ target "args" {
 }
 
 target "platforms" {
-  platforms = [
+  platforms = ALPINE_VERSION == "3.20" || ALPINE_VERSION == "latest" || ALPINE_VERSION == "edge" ? [
+    "linux/386",
+    "linux/amd64",
+    "linux/arm64",
+    "linux/arm/v6",
+    "linux/arm/v7",
+    "linux/ppc64le",
+    "linux/riscv64",
+    "linux/s390x"
+  ] : [
     "linux/386",
     "linux/amd64",
     "linux/arm64",