Add support for alpine 3.17, remove alpine 3.15

* Remove nsswitch.conf setup since alpine 3.16 and above contain nsswitch.conf by default. Signed-off-by: Kyle Squizzato <ksquizzato@mirantis.com>
docker-library · Nov 29, 2022 · 15fee71 · 15fee71
1 parent 326acd5
commit 15fee71
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 56 deletions.
diff --git a/1.18/alpine3.16/Dockerfile b/1.18/alpine3.16/Dockerfile
diff --git a/1.18/alpine3.15/Dockerfile → 1.18/alpine3.17/Dockerfile b/1.18/alpine3.15/Dockerfile → 1.18/alpine3.17/Dockerfile
diff --git a/1.19/alpine3.16/Dockerfile b/1.19/alpine3.16/Dockerfile
diff --git a/1.19/alpine3.15/Dockerfile → 1.19/alpine3.17/Dockerfile b/1.19/alpine3.15/Dockerfile → 1.19/alpine3.17/Dockerfile
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
@@ -10,16 +10,6 @@ FROM alpine:{{ alpine_version }}
 
 RUN apk add --no-cache ca-certificates
 
-# ensure that nsswitch.conf is set up for Go's "netgo" implementation
-# - https://github.com/golang/go/blob/go1.19.3/src/net/conf.go#L227-L303
-# - docker run --rm debian grep '^hosts:' /etc/nsswitch.conf
-# Alpine 3.16 includes nsswitch.conf
-RUN set -eux; \
-	if [ -e /etc/nsswitch.conf ]; then \
-		grep '^hosts: files dns' /etc/nsswitch.conf; \
-	else \
-		echo 'hosts: files dns' > /etc/nsswitch.conf; \
-	fi
 {{ ) else ( -}}
 FROM buildpack-deps:{{ env.variant }}-scm
 

diff --git a/versions.json b/versions.json
@@ -155,8 +155,8 @@
     "variants": [
       "bullseye",
       "buster",
+      "alpine3.17",
       "alpine3.16",
-      "alpine3.15",
       "windows/windowsservercore-ltsc2022",
       "windows/windowsservercore-1809",
       "windows/nanoserver-ltsc2022",
@@ -320,8 +320,8 @@
     "variants": [
       "bullseye",
       "buster",
+      "alpine3.17",
       "alpine3.16",
-      "alpine3.15",
       "windows/windowsservercore-ltsc2022",
       "windows/windowsservercore-1809",
       "windows/nanoserver-ltsc2022",

diff --git a/versions.sh b/versions.sh
@@ -144,8 +144,8 @@ for version in "${versions[@]}"; do
 			"bullseye",
 			"buster",
 			(
-				"3.16",
-				"3.15"
+				"3.17",
+				"3.16"
 			| "alpine" + .),
 			if .arches | has("windows-amd64") then
 				(