Update to Alpine 3.21

Signed-off-by: Neil Twigg <[email protected]>
nats-io · Dec 6, 2024 · ab2bb8b · ab2bb8b
1 parent 76fd30e
commit ab2bb8b
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml
@@ -39,13 +39,13 @@ jobs:
           TAG=${{ github.ref_name }}
           echo "TAG=${TAG#v}" >> "$GITHUB_OUTPUT"
 
-      - name: Alpine 3.20
+      - name: Alpine 3.21
         uses: docker/build-push-action@v6
         with:
-          context: ./2.10.x/alpine3.20/
+          context: ./2.10.x/alpine3.21/
           platforms: ${{ env.LINUX_ARCHS }}
           push: true
-          tags: ${{ env.IMAGE_NAME }}:${{ steps.ref.outputs.TAG }}-alpine3.20
+          tags: ${{ env.IMAGE_NAME }}:${{ steps.ref.outputs.TAG }}-alpine3.21
           provenance: mode=max
 
       - name: Scratch
@@ -58,7 +58,7 @@ jobs:
           tags: ${{ env.IMAGE_NAME }}:${{ steps.ref.outputs.TAG }}-scratch
           provenance: mode=max
           build-args: |
-            BASE_IMAGE=${{ env.IMAGE_NAME }}:${{ steps.ref.outputs.TAG }}-alpine3.20
+            BASE_IMAGE=${{ env.IMAGE_NAME }}:${{ steps.ref.outputs.TAG }}-alpine3.21
 
   windows-2019-2_10:
     name: Build Windows (2.10.x)
@@ -136,13 +136,13 @@ jobs:
           TAG=${{ github.ref_name }}
           echo "TAG=${TAG#v}" >> "$GITHUB_OUTPUT"
 
-      - name: Alpine 3.20
+      - name: Alpine 3.21
         uses: docker/build-push-action@v6
         with:
-          context: ./2.11.x/alpine3.20/
+          context: ./2.11.x/alpine3.21/
           platforms: ${{ env.LINUX_ARCHS }}
           push: true
-          tags: ${{ env.IMAGE_NAME }}:${{ steps.ref.outputs.TAG }}-alpine3.20
+          tags: ${{ env.IMAGE_NAME }}:${{ steps.ref.outputs.TAG }}-alpine3.21
           provenance: mode=max
 
       - name: Scratch
@@ -155,7 +155,7 @@ jobs:
           tags: ${{ env.IMAGE_NAME }}:${{ steps.ref.outputs.TAG }}-scratch
           provenance: mode=max
           build-args: |
-            BASE_IMAGE=${{ env.IMAGE_NAME }}:${{ steps.ref.outputs.TAG }}-alpine3.20
+            BASE_IMAGE=${{ env.IMAGE_NAME }}:${{ steps.ref.outputs.TAG }}-alpine3.21
 
   windows-2019-2_11:
     name: Build Windows (2.11.x)

diff --git a/2.10.x/alpine3.20/Dockerfile → 2.10.x/alpine3.21/Dockerfile b/2.10.x/alpine3.20/Dockerfile → 2.10.x/alpine3.21/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.21
 
 ENV NATS_SERVER 2.10.23-RC.10
 

diff --git a/2.10.x/alpine3.20/docker-entrypoint.sh → 2.10.x/alpine3.21/docker-entrypoint.sh b/2.10.x/alpine3.20/docker-entrypoint.sh → 2.10.x/alpine3.21/docker-entrypoint.sh
diff --git a/2.10.x/alpine3.20/nats-server.conf → 2.10.x/alpine3.21/nats-server.conf b/2.10.x/alpine3.20/nats-server.conf → 2.10.x/alpine3.21/nats-server.conf
diff --git a/2.10.x/scratch/Dockerfile b/2.10.x/scratch/Dockerfile
@@ -1,7 +1,7 @@
 FROM scratch
 ENV PATH="$PATH:/"
 
-COPY --from=nats:2.10.23-RC.10-alpine3.20 /usr/local/bin/nats-server /nats-server
+COPY --from=nats:2.10.23-RC.10-alpine3.21 /usr/local/bin/nats-server /nats-server
 COPY nats-server.conf /nats-server.conf
 
 EXPOSE 4222 8222 6222

diff --git a/2.10.x/scratch/Dockerfile.preview b/2.10.x/scratch/Dockerfile.preview
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=nats:2.10.23-RC.10-alpine3.20
+ARG BASE_IMAGE=nats:2.10.23-RC.10-alpine3.21
 FROM $BASE_IMAGE AS base
 
 FROM scratch

diff --git a/2.10.x/tests/build-images.sh b/2.10.x/tests/build-images.sh
@@ -4,8 +4,8 @@ set -ex
 ver=(NATS_SERVER 2.10.23-RC.10)
 
 (
-	cd "../alpine3.20"
-	docker build --tag nats:${ver[1]}-alpine3.20 .
+	cd "../alpine3.21"
+	docker build --tag nats:${ver[1]}-alpine3.21 .
 )
 
 (

diff --git a/2.10.x/tests/run-images.sh b/2.10.x/tests/run-images.sh
@@ -4,7 +4,7 @@ set -ex
 ver=(NATS_SERVER 2.10.23-RC.10)
 
 images=(
-	"nats:${ver[1]}-alpine3.20"
+	"nats:${ver[1]}-alpine3.21"
 	"nats:${ver[1]}-scratch"
 )
 

diff --git a/2.11.x/alpine3.20/Dockerfile → 2.11.x/alpine3.21/Dockerfile b/2.11.x/alpine3.20/Dockerfile → 2.11.x/alpine3.21/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.21
 
 ENV NATS_SERVER 2.11.0-preview.2
 

diff --git a/2.11.x/alpine3.20/docker-entrypoint.sh → 2.11.x/alpine3.21/docker-entrypoint.sh b/2.11.x/alpine3.20/docker-entrypoint.sh → 2.11.x/alpine3.21/docker-entrypoint.sh
diff --git a/2.11.x/alpine3.20/nats-server.conf → 2.11.x/alpine3.21/nats-server.conf b/2.11.x/alpine3.20/nats-server.conf → 2.11.x/alpine3.21/nats-server.conf
diff --git a/2.11.x/scratch/Dockerfile b/2.11.x/scratch/Dockerfile
@@ -1,7 +1,7 @@
 FROM scratch
 ENV PATH="$PATH:/"
 
-COPY --from=nats:2.11.0-preview.2-alpine3.20 /usr/local/bin/nats-server /nats-server
+COPY --from=nats:2.11.0-preview.2-alpine3.21 /usr/local/bin/nats-server /nats-server
 COPY nats-server.conf /nats-server.conf
 
 EXPOSE 4222 8222 6222

diff --git a/2.11.x/scratch/Dockerfile.preview b/2.11.x/scratch/Dockerfile.preview
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=nats:2.11.0-preview.2-alpine3.20
+ARG BASE_IMAGE=nats:2.11.0-preview.2-alpine3.21
 FROM $BASE_IMAGE AS base
 
 FROM scratch

diff --git a/2.11.x/tests/build-images.sh b/2.11.x/tests/build-images.sh
@@ -4,8 +4,8 @@ set -ex
 ver=(NATS_SERVER 2.11.0-preview.2)
 
 (
-	cd "../alpine3.20"
-	docker build --tag nats:${ver[1]}-alpine3.20 .
+	cd "../alpine3.21"
+	docker build --tag nats:${ver[1]}-alpine3.21 .
 )
 
 (

diff --git a/2.11.x/tests/run-images.sh b/2.11.x/tests/run-images.sh
@@ -4,7 +4,7 @@ set -ex
 ver=(NATS_SERVER 2.11.0-preview.2)
 
 images=(
-	"nats:${ver[1]}-alpine3.20"
+	"nats:${ver[1]}-alpine3.21"
 	"nats:${ver[1]}-scratch"
 )