From bec2cd65e330ff7a8c7ecba12051b424bbfe98c7 Mon Sep 17 00:00:00 2001 From: Francis Lavoie Date: Tue, 17 Jan 2023 06:31:59 -0500 Subject: [PATCH 1/3] Remove obsolete nsswitch fix Fix #273 --- Dockerfile.tmpl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl index 348a734..31fee04 100644 --- a/Dockerfile.tmpl +++ b/Dockerfile.tmpl @@ -33,10 +33,6 @@ RUN set -eux; \ chmod +x /usr/bin/caddy; \ caddy version -# set up nsswitch.conf for Go's "netgo" implementation -# - https://github.com/docker-library/golang/blob/1eb096131592bcbc90aa3b97471811c798a93573/1.14/alpine3.12/Dockerfile#L9 -RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf - # See https://caddyserver.com/docs/conventions#file-locations for details ENV XDG_CONFIG_HOME /config ENV XDG_DATA_HOME /data From 7bebcbe6a3abe6ed873568ae40fbe23d9b7ce6d0 Mon Sep 17 00:00:00 2001 From: Francis Lavoie Date: Tue, 17 Jan 2023 06:47:04 -0500 Subject: [PATCH 2/3] Also update generated file --- 2.6/alpine/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/2.6/alpine/Dockerfile b/2.6/alpine/Dockerfile index 1ff2f38..d79b7df 100644 --- a/2.6/alpine/Dockerfile +++ b/2.6/alpine/Dockerfile @@ -33,10 +33,6 @@ RUN set -eux; \ chmod +x /usr/bin/caddy; \ caddy version -# set up nsswitch.conf for Go's "netgo" implementation -# - https://github.com/docker-library/golang/blob/1eb096131592bcbc90aa3b97471811c798a93573/1.14/alpine3.12/Dockerfile#L9 -RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf - # See https://caddyserver.com/docs/conventions#file-locations for details ENV XDG_CONFIG_HOME /config ENV XDG_DATA_HOME /data From b6dcb8f2f230acdc8b4e02b0e8ccb04878dc7a50 Mon Sep 17 00:00:00 2001 From: Dave Henderson Date: Thu, 19 Jan 2023 09:16:33 -0500 Subject: [PATCH 3/3] update stackbrew file Signed-off-by: Dave Henderson --- library/caddy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/caddy b/library/caddy index bc6761e..8498dc2 100644 --- a/library/caddy +++ b/library/caddy @@ -7,7 +7,7 @@ Tags: 2.6.2-alpine, 2.6-alpine, 2-alpine, alpine SharedTags: 2.6.2, 2.6, 2, latest GitRepo: https://github.com/caddyserver/caddy-docker.git Directory: 2.6/alpine -GitCommit: 9c857d39bef831f27612106ddd00a4df307e8975 +GitCommit: 7bebcbe6a3abe6ed873568ae40fbe23d9b7ce6d0 Architectures: amd64, arm64v8, arm32v6, arm32v7, ppc64le, s390x Tags: 2.6.2-builder-alpine, 2.6-builder-alpine, 2-builder-alpine, builder-alpine