Merge pull request #216 from Darlelet/ca-certs

Resolving missing ca-certificates dependency that causes client ssl verify to fail
docker-library · Dec 21, 2023 · 79a32f7 · 79a32f7
2 parents edf0471 + 71cd019
commit 79a32f7
Show file tree

Hide file tree

Showing 17 changed files with 144 additions and 9 deletions.
diff --git a/2.0/Dockerfile b/2.0/Dockerfile
diff --git a/2.0/alpine/Dockerfile b/2.0/alpine/Dockerfile
diff --git a/2.2/Dockerfile b/2.2/Dockerfile
diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile
diff --git a/2.4/Dockerfile b/2.4/Dockerfile
diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile
diff --git a/2.6/Dockerfile b/2.6/Dockerfile
diff --git a/2.6/alpine/Dockerfile b/2.6/alpine/Dockerfile
diff --git a/2.7/Dockerfile b/2.7/Dockerfile
diff --git a/2.7/alpine/Dockerfile b/2.7/alpine/Dockerfile
diff --git a/2.8/Dockerfile b/2.8/Dockerfile
diff --git a/2.8/alpine/Dockerfile b/2.8/alpine/Dockerfile
diff --git a/2.9/Dockerfile b/2.9/Dockerfile
diff --git a/2.9/alpine/Dockerfile b/2.9/alpine/Dockerfile
diff --git a/3.0/Dockerfile b/3.0/Dockerfile
diff --git a/3.0/alpine/Dockerfile b/3.0/alpine/Dockerfile
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -1,6 +1,13 @@
 {{ if env.variant == "alpine" then ( -}}
 FROM alpine:{{ .alpine }}
 
+# runtime dependencies
+RUN set -eux; \
+	apk add --no-cache \
+# @system-ca: https://github.com/docker-library/haproxy/pull/216
+		ca-certificates \
+	;
+
 # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable
 RUN set -eux; \
 	addgroup --gid 99 --system haproxy; \
@@ -18,6 +25,15 @@ RUN set -eux; \
 {{ ) else ( -}}
 FROM debian:{{ .debian }}
 
+# runtime dependencies
+RUN set -eux; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+# @system-ca: https://github.com/docker-library/haproxy/pull/216
+		ca-certificates \
+	; \
+	rm -rf /var/lib/apt/lists/*
+
 # roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6
 RUN set -eux; \
 	groupadd --gid 99 --system haproxy; \
@@ -72,7 +88,6 @@ RUN set -eux; \
 {{ ) else ( -}}
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update && apt-get install -y --no-install-recommends \
-		ca-certificates \
 		gcc \
 		libc6-dev \
 		liblua{{ lua }}-dev \