From 3546ba31aa42db88ddc1f0765fd343383f441428 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Thu, 7 Dec 2023 10:59:20 +0100 Subject: [PATCH 1/2] Add Alpine 3.19 and drop 3.17 to architectures and versions.json Also set 3.19 as new default --- architectures | 14 +++++++------- config | 2 +- versions.json | 18 +++++++++--------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/architectures b/architectures index 7d01f6668..1ef81e6bb 100644 --- a/architectures +++ b/architectures @@ -1,8 +1,8 @@ bashbrew-arch variants -amd64 alpine3.17,alpine3.18,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim -arm32v6 alpine3.17,alpine3.18 -arm32v7 alpine3.17,alpine3.18,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim -arm64v8 alpine3.17,alpine3.18,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim -i386 alpine3.17,alpine3.18 -ppc64le alpine3.17,alpine3.18,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim -s390x alpine3.17,alpine3.18,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim +amd64 alpine3.18,alpine3.19,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim +arm32v6 alpine3.18,alpine3.19 +arm32v7 alpine3.18,alpine3.19,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim +arm64v8 alpine3.18,alpine3.19,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim +i386 alpine3.18,alpine3.19 +ppc64le alpine3.18,alpine3.19,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim +s390x alpine3.18,alpine3.19,bookworm,bookworm-slim,bullseye,bullseye-slim,buster,buster-slim diff --git a/config b/config index c16690516..7c216ecde 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ baseuri https://nodejs.org/dist default_variant bookworm -alpine_version 3.18 +alpine_version 3.19 debian_versions bookworm bullseye buster diff --git a/versions.json b/versions.json index 29687e36b..15e45e5f3 100644 --- a/versions.json +++ b/versions.json @@ -5,10 +5,10 @@ "maintenance": "2024-04-01", "end": "2024-06-01", "codename": "", - "alpine-default": "alpine3.18", + "alpine-default": "alpine3.19", "debian-default": "bookworm", "variants": { - "alpine3.17": [ + "alpine3.18": [ "amd64", "arm32v6", "arm32v7", @@ -16,7 +16,7 @@ "ppc64le", "s390x" ], - "alpine3.18": [ + "alpine3.19": [ "amd64", "arm32v6", "arm32v7", @@ -60,10 +60,10 @@ "maintenance": "2024-10-22", "end": "2026-04-30", "codename": "iron", - "alpine-default": "alpine3.18", + "alpine-default": "alpine3.19", "debian-default": "bookworm", "variants": { - "alpine3.17": [ + "alpine3.18": [ "amd64", "arm32v6", "arm32v7", @@ -71,7 +71,7 @@ "ppc64le", "s390x" ], - "alpine3.18": [ + "alpine3.19": [ "amd64", "arm32v6", "arm32v7", @@ -125,10 +125,10 @@ "maintenance": "2023-10-18", "end": "2025-04-30", "codename": "hydrogen", - "alpine-default": "alpine3.18", + "alpine-default": "alpine3.19", "debian-default": "bookworm", "variants": { - "alpine3.17": [ + "alpine3.18": [ "amd64", "arm32v6", "arm32v7", @@ -136,7 +136,7 @@ "ppc64le", "s390x" ], - "alpine3.18": [ + "alpine3.19": [ "amd64", "arm32v6", "arm32v7", From 5bb305299145aa996bd3e0a701e5a3c3d587ad82 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Thu, 7 Dec 2023 10:59:38 +0100 Subject: [PATCH 2/2] Update templates to add Alpine 3.19 and drop 3.17 --- 18/{alpine3.17 => alpine3.19}/Dockerfile | 2 +- 18/{alpine3.17 => alpine3.19}/docker-entrypoint.sh | 0 20/{alpine3.17 => alpine3.19}/Dockerfile | 2 +- 20/{alpine3.17 => alpine3.19}/docker-entrypoint.sh | 0 21/{alpine3.17 => alpine3.19}/Dockerfile | 2 +- 21/{alpine3.17 => alpine3.19}/docker-entrypoint.sh | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename 18/{alpine3.17 => alpine3.19}/Dockerfile (99%) rename 18/{alpine3.17 => alpine3.19}/docker-entrypoint.sh (100%) rename 20/{alpine3.17 => alpine3.19}/Dockerfile (99%) rename 20/{alpine3.17 => alpine3.19}/docker-entrypoint.sh (100%) rename 21/{alpine3.17 => alpine3.19}/Dockerfile (99%) rename 21/{alpine3.17 => alpine3.19}/docker-entrypoint.sh (100%) diff --git a/18/alpine3.17/Dockerfile b/18/alpine3.19/Dockerfile similarity index 99% rename from 18/alpine3.17/Dockerfile rename to 18/alpine3.19/Dockerfile index 09a899920..dbf073163 100644 --- a/18/alpine3.17/Dockerfile +++ b/18/alpine3.19/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.17 +FROM alpine:3.19 ENV NODE_VERSION 18.19.0 diff --git a/18/alpine3.17/docker-entrypoint.sh b/18/alpine3.19/docker-entrypoint.sh similarity index 100% rename from 18/alpine3.17/docker-entrypoint.sh rename to 18/alpine3.19/docker-entrypoint.sh diff --git a/20/alpine3.17/Dockerfile b/20/alpine3.19/Dockerfile similarity index 99% rename from 20/alpine3.17/Dockerfile rename to 20/alpine3.19/Dockerfile index 0b75caf78..e70d6a1b1 100644 --- a/20/alpine3.17/Dockerfile +++ b/20/alpine3.19/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.17 +FROM alpine:3.19 ENV NODE_VERSION 20.10.0 diff --git a/20/alpine3.17/docker-entrypoint.sh b/20/alpine3.19/docker-entrypoint.sh similarity index 100% rename from 20/alpine3.17/docker-entrypoint.sh rename to 20/alpine3.19/docker-entrypoint.sh diff --git a/21/alpine3.17/Dockerfile b/21/alpine3.19/Dockerfile similarity index 99% rename from 21/alpine3.17/Dockerfile rename to 21/alpine3.19/Dockerfile index cd9ada107..1d16c5c5d 100644 --- a/21/alpine3.17/Dockerfile +++ b/21/alpine3.19/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.17 +FROM alpine:3.19 ENV NODE_VERSION 21.4.0 diff --git a/21/alpine3.17/docker-entrypoint.sh b/21/alpine3.19/docker-entrypoint.sh similarity index 100% rename from 21/alpine3.17/docker-entrypoint.sh rename to 21/alpine3.19/docker-entrypoint.sh