From 03d21ef7daf1f356142dcfaed18febf36efd391e Mon Sep 17 00:00:00 2001 From: Timothy Steward Date: Wed, 10 May 2023 16:46:06 -0500 Subject: [PATCH] Add support for alpine 3.18, remove alpine 3.16 --- 1.19/{alpine3.16 => alpine3.18}/Dockerfile | 2 +- 1.20/{alpine3.16 => alpine3.18}/Dockerfile | 2 +- versions.json | 4 ++-- versions.sh | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename 1.19/{alpine3.16 => alpine3.18}/Dockerfile (99%) rename 1.20/{alpine3.16 => alpine3.18}/Dockerfile (99%) diff --git a/1.19/alpine3.16/Dockerfile b/1.19/alpine3.18/Dockerfile similarity index 99% rename from 1.19/alpine3.16/Dockerfile rename to 1.19/alpine3.18/Dockerfile index ebf5f969..6974efc3 100644 --- a/1.19/alpine3.16/Dockerfile +++ b/1.19/alpine3.18/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.16 +FROM alpine:3.18 RUN apk add --no-cache ca-certificates diff --git a/1.20/alpine3.16/Dockerfile b/1.20/alpine3.18/Dockerfile similarity index 99% rename from 1.20/alpine3.16/Dockerfile rename to 1.20/alpine3.18/Dockerfile index a74f140a..be71dfc5 100644 --- a/1.20/alpine3.16/Dockerfile +++ b/1.20/alpine3.18/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.16 +FROM alpine:3.18 RUN apk add --no-cache ca-certificates diff --git a/versions.json b/versions.json index 0331b8d2..e162ac54 100644 --- a/versions.json +++ b/versions.json @@ -155,8 +155,8 @@ "variants": [ "bullseye", "buster", + "alpine3.18", "alpine3.17", - "alpine3.16", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809", "windows/nanoserver-ltsc2022", @@ -320,8 +320,8 @@ "variants": [ "bullseye", "buster", + "alpine3.18", "alpine3.17", - "alpine3.16", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809", "windows/nanoserver-ltsc2022", diff --git a/versions.sh b/versions.sh index a26dea47..b2a9911e 100755 --- a/versions.sh +++ b/versions.sh @@ -146,8 +146,8 @@ for version in "${versions[@]}"; do "bullseye", "buster", ( - "3.17", - "3.16" + "3.18", + "3.17" | "alpine" + .), if .arches | has("windows-amd64") then (