Merge pull request #95 from crazy-max/2.2-alpine-3.21

[2.2] Alpine Linux 3.21
crazy-max · Dec 24, 2024 · 0070330 · 0070330
2 parents e04f141 + 0da4a94
commit 0070330
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 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:
           - pureftpd
           - 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/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/amd64",
     "linux/arm/v6",
     "linux/arm/v7",
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,12 +27,12 @@ jobs: @@
               - pureftpd
               - rrdtool
             alpine_version:
-              - '3.15'
               - '3.16'
               - '3.17'
               - '3.18'
               - '3.19'
               - '3.20'
+              - '3.21'
               - 'edge'
         runs-on: ubuntu-latest
         steps:
@@ Expand Down @@