Update haproxy #15954

tianon · 2023-12-21T17:44:14Z

Changes:

docker-library/haproxy@79a32f7: Merge pull request Resolving missing ca-certificates dependency that causes client ssl verify to fail haproxy#216 from Darlelet/ca-certs
docker-library/haproxy@71cd019: Resolving missing ca-certificates dependency that causes client ssl verify to fail

Changes: - docker-library/haproxy@79a32f7: Merge pull request docker-library/haproxy#216 from Darlelet/ca-certs - docker-library/haproxy@71cd019: Resolving missing ca-certificates dependency that causes client ssl verify to fail

github-actions · 2023-12-21T17:45:41Z

Diff for d14991b:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index f6cc2b3..59ba8f6 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,80 +3,80 @@ GitRepo: https://github.com/docker-library/haproxy.git
 
 Tags: 2.0.34, 2.0, 2.0.34-buster, 2.0-buster
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 1689052e242008bfabfd0259acdbcf0bf69a1743
+GitCommit: 71cd0194b981bcbf23e964649016ca7498b1c2b8
 Directory: 2.0
 
 Tags: 2.0.34-alpine, 2.0-alpine, 2.0.34-alpine3.16, 2.0-alpine3.16
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 1689052e242008bfabfd0259acdbcf0bf69a1743
+GitCommit: 71cd0194b981bcbf23e964649016ca7498b1c2b8
 Directory: 2.0/alpine
 
 Tags: 2.2.32, 2.2, 2.2.32-bullseye, 2.2-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: edf0471abcc8d46fec439f9bddffa0d57da97053
+GitCommit: 71cd0194b981bcbf23e964649016ca7498b1c2b8
 Directory: 2.2
 
 Tags: 2.2.32-alpine, 2.2-alpine, 2.2.32-alpine3.16, 2.2-alpine3.16
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: edf0471abcc8d46fec439f9bddffa0d57da97053
+GitCommit: 71cd0194b981bcbf23e964649016ca7498b1c2b8
 Directory: 2.2/alpine
 
 Tags: 2.4.25, 2.4, 2.4.25-bookworm, 2.4-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b2d07293f7145e5630e88695f8b570dcb0650bf9
+GitCommit: 71cd0194b981bcbf23e964649016ca7498b1c2b8
 Directory: 2.4
 
 Tags: 2.4.25-alpine, 2.4-alpine, 2.4.25-alpine3.19, 2.4-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b2d07293f7145e5630e88695f8b570dcb0650bf9
+GitCommit: 71cd0194b981bcbf23e964649016ca7498b1c2b8
 Directory: 2.4/alpine
 
 Tags: 2.6.16, 2.6, 2.6.16-bookworm, 2.6-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: e4b286a573e8f3bad0cc367ffc0f8e0a330d8307
+GitCommit: 71cd0194b981bcbf23e964649016ca7498b1c2b8
 Directory: 2.6
 
 Tags: 2.6.16-alpine, 2.6-alpine, 2.6.16-alpine3.19, 2.6-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: e4b286a573e8f3bad0cc367ffc0f8e0a330d8307
+GitCommit: 71cd0194b981bcbf23e964649016ca7498b1c2b8
 Directory: 2.6/alpine
 
 Tags: 2.7.11, 2.7, 2.7.11-bookworm, 2.7-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 71aadfadc524b2bec5a4d6e620d1f9a22f431c27
+GitCommit: 71cd0194b981bcbf23e964649016ca7498b1c2b8
 Directory: 2.7
 
 Tags: 2.7.11-alpine, 2.7-alpine, 2.7.11-alpine3.19, 2.7-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 4df9df86887f5422e63e3522f1f958ce735b8ebb
+GitCommit: 71cd0194b981bcbf23e964649016ca7498b1c2b8
 Directory: 2.7/alpine
 
 Tags: 2.8.5, 2.8, lts, 2.8.5-bookworm, 2.8-bookworm, lts-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 71aadfadc524b2bec5a4d6e620d1f9a22f431c27
+GitCommit: 71cd0194b981bcbf23e964649016ca7498b1c2b8
 Directory: 2.8
 
 Tags: 2.8.5-alpine, 2.8-alpine, lts-alpine, 2.8.5-alpine3.19, 2.8-alpine3.19, lts-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 4df9df86887f5422e63e3522f1f958ce735b8ebb
+GitCommit: 71cd0194b981bcbf23e964649016ca7498b1c2b8
 Directory: 2.8/alpine
 
 Tags: 2.9.1, 2.9, latest, 2.9.1-bookworm, 2.9-bookworm, bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 66c5b5e84b5f86a8047f5d8f9472e5fa6e3711e8
+GitCommit: 71cd0194b981bcbf23e964649016ca7498b1c2b8
 Directory: 2.9
 
 Tags: 2.9.1-alpine, 2.9-alpine, alpine, 2.9.1-alpine3.19, 2.9-alpine3.19, alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 66c5b5e84b5f86a8047f5d8f9472e5fa6e3711e8
+GitCommit: 71cd0194b981bcbf23e964649016ca7498b1c2b8
 Directory: 2.9/alpine
 
 Tags: 3.0-dev0, 3.0-dev, 3.0-dev0-bookworm, 3.0-dev-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0d5ae965f4941abfe179b11761bfec9c5ef191ff
+GitCommit: 71cd0194b981bcbf23e964649016ca7498b1c2b8
 Directory: 3.0
 
 Tags: 3.0-dev0-alpine, 3.0-dev-alpine, 3.0-dev0-alpine3.19, 3.0-dev-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0d5ae965f4941abfe179b11761bfec9c5ef191ff
+GitCommit: 71cd0194b981bcbf23e964649016ca7498b1c2b8
 Directory: 3.0/alpine
diff --git a/haproxy_2.0-alpine3.16/Dockerfile b/haproxy_2.0-alpine3.16/Dockerfile
index bf8e3c1..f4ca1fd 100644
--- a/haproxy_2.0-alpine3.16/Dockerfile
+++ b/haproxy_2.0-alpine3.16/Dockerfile
@@ -6,6 +6,13 @@
 
 FROM alpine:3.16
 
+# 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; \
diff --git a/haproxy_2.0-buster/Dockerfile b/haproxy_2.0-buster/Dockerfile
index c760bc5..96e7b29 100644
--- a/haproxy_2.0-buster/Dockerfile
+++ b/haproxy_2.0-buster/Dockerfile
@@ -6,6 +6,15 @@
 
 FROM debian:buster-slim
 
+# 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; \
@@ -29,7 +38,6 @@ RUN set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update && apt-get install -y --no-install-recommends \
-		ca-certificates \
 		gcc \
 		libc6-dev \
 		liblua5.3-dev \
diff --git a/haproxy_2.2-alpine3.16/Dockerfile b/haproxy_2.2-alpine3.16/Dockerfile
index d6b7ab5..e638b45 100644
--- a/haproxy_2.2-alpine3.16/Dockerfile
+++ b/haproxy_2.2-alpine3.16/Dockerfile
@@ -6,6 +6,13 @@
 
 FROM alpine:3.16
 
+# 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; \
diff --git a/haproxy_2.2-bullseye/Dockerfile b/haproxy_2.2-bullseye/Dockerfile
index 24ce9dd..3ce09ad 100644
--- a/haproxy_2.2-bullseye/Dockerfile
+++ b/haproxy_2.2-bullseye/Dockerfile
@@ -6,6 +6,15 @@
 
 FROM debian:bullseye-slim
 
+# 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; \
@@ -29,7 +38,6 @@ RUN set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update && apt-get install -y --no-install-recommends \
-		ca-certificates \
 		gcc \
 		libc6-dev \
 		liblua5.3-dev \
diff --git a/haproxy_2.4-alpine3.19/Dockerfile b/haproxy_2.4-alpine3.19/Dockerfile
index 1ab20b9..bba2f15 100644
--- a/haproxy_2.4-alpine3.19/Dockerfile
+++ b/haproxy_2.4-alpine3.19/Dockerfile
@@ -6,6 +6,13 @@
 
 FROM alpine:3.19
 
+# 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; \
diff --git a/haproxy_2.4-bookworm/Dockerfile b/haproxy_2.4-bookworm/Dockerfile
index e7f8c2c..6069602 100644
--- a/haproxy_2.4-bookworm/Dockerfile
+++ b/haproxy_2.4-bookworm/Dockerfile
@@ -6,6 +6,15 @@
 
 FROM debian:bookworm-slim
 
+# 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; \
@@ -29,7 +38,6 @@ RUN set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update && apt-get install -y --no-install-recommends \
-		ca-certificates \
 		gcc \
 		libc6-dev \
 		liblua5.3-dev \
diff --git a/haproxy_2.6-alpine3.19/Dockerfile b/haproxy_2.6-alpine3.19/Dockerfile
index 0f21077..d39007e 100644
--- a/haproxy_2.6-alpine3.19/Dockerfile
+++ b/haproxy_2.6-alpine3.19/Dockerfile
@@ -6,6 +6,13 @@
 
 FROM alpine:3.19
 
+# 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; \
diff --git a/haproxy_2.6-bookworm/Dockerfile b/haproxy_2.6-bookworm/Dockerfile
index 233e7b4..4e32186 100644
--- a/haproxy_2.6-bookworm/Dockerfile
+++ b/haproxy_2.6-bookworm/Dockerfile
@@ -6,6 +6,15 @@
 
 FROM debian:bookworm-slim
 
+# 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; \
@@ -29,7 +38,6 @@ RUN set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update && apt-get install -y --no-install-recommends \
-		ca-certificates \
 		gcc \
 		libc6-dev \
 		liblua5.3-dev \
diff --git a/haproxy_2.7-alpine3.19/Dockerfile b/haproxy_2.7-alpine3.19/Dockerfile
index 7cadd4f..f7de12d 100644
--- a/haproxy_2.7-alpine3.19/Dockerfile
+++ b/haproxy_2.7-alpine3.19/Dockerfile
@@ -6,6 +6,13 @@
 
 FROM alpine:3.19
 
+# 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; \
diff --git a/haproxy_2.7-bookworm/Dockerfile b/haproxy_2.7-bookworm/Dockerfile
index 97fff68..99bf5e6 100644
--- a/haproxy_2.7-bookworm/Dockerfile
+++ b/haproxy_2.7-bookworm/Dockerfile
@@ -6,6 +6,15 @@
 
 FROM debian:bookworm-slim
 
+# 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; \
@@ -29,7 +38,6 @@ RUN set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update && apt-get install -y --no-install-recommends \
-		ca-certificates \
 		gcc \
 		libc6-dev \
 		liblua5.3-dev \
diff --git a/haproxy_3.0-dev-alpine3.19/Dockerfile b/haproxy_3.0-dev-alpine3.19/Dockerfile
index 4770ab7..ccc5773 100644
--- a/haproxy_3.0-dev-alpine3.19/Dockerfile
+++ b/haproxy_3.0-dev-alpine3.19/Dockerfile
@@ -6,6 +6,13 @@
 
 FROM alpine:3.19
 
+# 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; \
diff --git a/haproxy_3.0-dev-bookworm/Dockerfile b/haproxy_3.0-dev-bookworm/Dockerfile
index 8865a4c..a26b3e3 100644
--- a/haproxy_3.0-dev-bookworm/Dockerfile
+++ b/haproxy_3.0-dev-bookworm/Dockerfile
@@ -6,6 +6,15 @@
 
 FROM debian:bookworm-slim
 
+# 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; \
@@ -29,7 +38,6 @@ RUN set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update && apt-get install -y --no-install-recommends \
-		ca-certificates \
 		gcc \
 		libc6-dev \
 		liblua5.4-dev \
diff --git a/haproxy_alpine3.19/Dockerfile b/haproxy_alpine3.19/Dockerfile
index 644e13b..973aa8d 100644
--- a/haproxy_alpine3.19/Dockerfile
+++ b/haproxy_alpine3.19/Dockerfile
@@ -6,6 +6,13 @@
 
 FROM alpine:3.19
 
+# 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; \
diff --git a/haproxy_bookworm/Dockerfile b/haproxy_bookworm/Dockerfile
index 0417214..d60d7ed 100644
--- a/haproxy_bookworm/Dockerfile
+++ b/haproxy_bookworm/Dockerfile
@@ -6,6 +6,15 @@
 
 FROM debian:bookworm-slim
 
+# 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; \
@@ -29,7 +38,6 @@ RUN set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update && apt-get install -y --no-install-recommends \
-		ca-certificates \
 		gcc \
 		libc6-dev \
 		liblua5.4-dev \
diff --git a/haproxy_lts-alpine3.19/Dockerfile b/haproxy_lts-alpine3.19/Dockerfile
index 4cbc6af..ac04bce 100644
--- a/haproxy_lts-alpine3.19/Dockerfile
+++ b/haproxy_lts-alpine3.19/Dockerfile
@@ -6,6 +6,13 @@
 
 FROM alpine:3.19
 
+# 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; \
diff --git a/haproxy_lts-bookworm/Dockerfile b/haproxy_lts-bookworm/Dockerfile
index 62dfa03..faf47bb 100644
--- a/haproxy_lts-bookworm/Dockerfile
+++ b/haproxy_lts-bookworm/Dockerfile
@@ -6,6 +6,15 @@
 
 FROM debian:bookworm-slim
 
+# 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; \
@@ -29,7 +38,6 @@ RUN set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update && apt-get install -y --no-install-recommends \
-		ca-certificates \
 		gcc \
 		libc6-dev \
 		liblua5.3-dev \

Relevant Maintainers:

haproxy: @tianon @yosifkit

Update haproxy

d14991b

Changes: - docker-library/haproxy@79a32f7: Merge pull request docker-library/haproxy#216 from Darlelet/ca-certs - docker-library/haproxy@71cd019: Resolving missing ca-certificates dependency that causes client ssl verify to fail

github-actions bot added the library/haproxy label Dec 21, 2023

yosifkit approved these changes Dec 21, 2023

View reviewed changes

yosifkit merged commit 8f87641 into docker-library:master Dec 21, 2023
21 checks passed

yosifkit deleted the haproxy branch December 21, 2023 19:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update haproxy #15954

Update haproxy #15954

tianon commented Dec 21, 2023

github-actions bot commented Dec 21, 2023

Update haproxy #15954

Update haproxy #15954

Conversation

tianon commented Dec 21, 2023

github-actions bot commented Dec 21, 2023