Update haproxy #15905
Merged
Update haproxy #15905
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/haproxy@e4b286a: Update 2.6 to 2.6.16 - docker-library/haproxy@f74e9f8: Merge pull request docker-library/haproxy#214 from infosiftr/bookworm - docker-library/haproxy@37ba32b: Pin 2.2 to Debian Bullseye and Alpine 3.16 to avoid OpenSSL 3 (unsupported until 2.6+ and backported to 2.4) - docker-library/haproxy@71aadfa: Update to Debian bookworm
Diff for ec995f7:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7c17f04..02dd57d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,7 +3,7 @@ GitRepo: https://github.com/docker-library/haproxy.git
Tags: 2.0.33, 2.0, 2.0.33-buster, 2.0-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 9c85db58f62beefbcbc4fabc5697ddaeb9ff3ff2
+GitCommit: 71aadfadc524b2bec5a4d6e620d1f9a22f431c27
Directory: 2.0
Tags: 2.0.33-alpine, 2.0-alpine, 2.0.33-alpine3.16, 2.0-alpine3.16
@@ -13,17 +13,17 @@ Directory: 2.0/alpine
Tags: 2.2.31, 2.2, 2.2.31-bullseye, 2.2-bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: ad34487167b0bb727cb56000f26d8ea37449c590
+GitCommit: 37ba32b245a7c55a5a42a554795d7140acbf4113
Directory: 2.2
-Tags: 2.2.31-alpine, 2.2-alpine, 2.2.31-alpine3.19, 2.2-alpine3.19
+Tags: 2.2.31-alpine, 2.2-alpine, 2.2.31-alpine3.16, 2.2-alpine3.16
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 4df9df86887f5422e63e3522f1f958ce735b8ebb
+GitCommit: 37ba32b245a7c55a5a42a554795d7140acbf4113
Directory: 2.2/alpine
-Tags: 2.4.24, 2.4, 2.4.24-bullseye, 2.4-bullseye
+Tags: 2.4.24, 2.4, 2.4.24-bookworm, 2.4-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 4c041fe042121e9f30046440f12cf0d2747a5061
+GitCommit: 71aadfadc524b2bec5a4d6e620d1f9a22f431c27
Directory: 2.4
Tags: 2.4.24-alpine, 2.4-alpine, 2.4.24-alpine3.19, 2.4-alpine3.19
@@ -31,19 +31,19 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 4df9df86887f5422e63e3522f1f958ce735b8ebb
Directory: 2.4/alpine
-Tags: 2.6.15, 2.6, 2.6.15-bullseye, 2.6-bullseye
+Tags: 2.6.16, 2.6, 2.6.16-bookworm, 2.6-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: fc50ce81390257a9702f3ea74237a73c658a1789
+GitCommit: e4b286a573e8f3bad0cc367ffc0f8e0a330d8307
Directory: 2.6
-Tags: 2.6.15-alpine, 2.6-alpine, 2.6.15-alpine3.19, 2.6-alpine3.19
+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: 4df9df86887f5422e63e3522f1f958ce735b8ebb
+GitCommit: e4b286a573e8f3bad0cc367ffc0f8e0a330d8307
Directory: 2.6/alpine
-Tags: 2.7.11, 2.7, 2.7.11-bullseye, 2.7-bullseye
+Tags: 2.7.11, 2.7, 2.7.11-bookworm, 2.7-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 68e4a3bbf0ff9acbdba492321b63c2bfdf9f9e22
+GitCommit: 71aadfadc524b2bec5a4d6e620d1f9a22f431c27
Directory: 2.7
Tags: 2.7.11-alpine, 2.7-alpine, 2.7.11-alpine3.19, 2.7-alpine3.19
@@ -51,9 +51,9 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 4df9df86887f5422e63e3522f1f958ce735b8ebb
Directory: 2.7/alpine
-Tags: 2.8.5, 2.8, lts, 2.8.5-bullseye, 2.8-bullseye, lts-bullseye
+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: a287ce7a211b83adb90b1b3bd97d534c0520be8a
+GitCommit: 71aadfadc524b2bec5a4d6e620d1f9a22f431c27
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
@@ -61,9 +61,9 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 4df9df86887f5422e63e3522f1f958ce735b8ebb
Directory: 2.8/alpine
-Tags: 2.9.0, 2.9, latest, 2.9.0-bullseye, 2.9-bullseye, bullseye
+Tags: 2.9.0, 2.9, latest, 2.9.0-bookworm, 2.9-bookworm, bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a2cdec0b128a2c128a6e81c93b67ec502b2131f3
+GitCommit: 71aadfadc524b2bec5a4d6e620d1f9a22f431c27
Directory: 2.9
Tags: 2.9.0-alpine, 2.9-alpine, alpine, 2.9.0-alpine3.19, 2.9-alpine3.19, alpine3.19
@@ -71,9 +71,9 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 4df9df86887f5422e63e3522f1f958ce735b8ebb
Directory: 2.9/alpine
-Tags: 3.0-dev0, 3.0-dev, 3.0-dev0-bullseye, 3.0-dev-bullseye
+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: e3fc1f8a671d2362e20ce2895fe284bef3934926
+GitCommit: 71aadfadc524b2bec5a4d6e620d1f9a22f431c27
Directory: 3.0
Tags: 3.0-dev0-alpine, 3.0-dev-alpine, 3.0-dev0-alpine3.19, 3.0-dev-alpine3.19
diff --git a/_bashbrew-list b/_bashbrew-list
index fe41880..0478827 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -8,64 +8,64 @@ haproxy:2.0.33-alpine3.16
haproxy:2.0.33-buster
haproxy:2.2
haproxy:2.2-alpine
-haproxy:2.2-alpine3.19
+haproxy:2.2-alpine3.16
haproxy:2.2-bullseye
haproxy:2.2.31
haproxy:2.2.31-alpine
-haproxy:2.2.31-alpine3.19
+haproxy:2.2.31-alpine3.16
haproxy:2.2.31-bullseye
haproxy:2.4
haproxy:2.4-alpine
haproxy:2.4-alpine3.19
-haproxy:2.4-bullseye
+haproxy:2.4-bookworm
haproxy:2.4.24
haproxy:2.4.24-alpine
haproxy:2.4.24-alpine3.19
-haproxy:2.4.24-bullseye
+haproxy:2.4.24-bookworm
haproxy:2.6
haproxy:2.6-alpine
haproxy:2.6-alpine3.19
-haproxy:2.6-bullseye
-haproxy:2.6.15
-haproxy:2.6.15-alpine
-haproxy:2.6.15-alpine3.19
-haproxy:2.6.15-bullseye
+haproxy:2.6-bookworm
+haproxy:2.6.16
+haproxy:2.6.16-alpine
+haproxy:2.6.16-alpine3.19
+haproxy:2.6.16-bookworm
haproxy:2.7
haproxy:2.7-alpine
haproxy:2.7-alpine3.19
-haproxy:2.7-bullseye
+haproxy:2.7-bookworm
haproxy:2.7.11
haproxy:2.7.11-alpine
haproxy:2.7.11-alpine3.19
-haproxy:2.7.11-bullseye
+haproxy:2.7.11-bookworm
haproxy:2.8
haproxy:2.8-alpine
haproxy:2.8-alpine3.19
-haproxy:2.8-bullseye
+haproxy:2.8-bookworm
haproxy:2.8.5
haproxy:2.8.5-alpine
haproxy:2.8.5-alpine3.19
-haproxy:2.8.5-bullseye
+haproxy:2.8.5-bookworm
haproxy:2.9
haproxy:2.9-alpine
haproxy:2.9-alpine3.19
-haproxy:2.9-bullseye
+haproxy:2.9-bookworm
haproxy:2.9.0
haproxy:2.9.0-alpine
haproxy:2.9.0-alpine3.19
-haproxy:2.9.0-bullseye
+haproxy:2.9.0-bookworm
haproxy:3.0-dev0
haproxy:3.0-dev0-alpine
haproxy:3.0-dev0-alpine3.19
-haproxy:3.0-dev0-bullseye
+haproxy:3.0-dev0-bookworm
haproxy:3.0-dev-alpine
haproxy:3.0-dev-alpine3.19
-haproxy:3.0-dev-bullseye
+haproxy:3.0-dev-bookworm
haproxy:alpine
haproxy:alpine3.19
-haproxy:bullseye
+haproxy:bookworm
haproxy:latest
haproxy:lts
haproxy:lts-alpine
haproxy:lts-alpine3.19
-haproxy:lts-bullseye
+haproxy:lts-bookworm
diff --git a/haproxy_2.0-buster/Dockerfile b/haproxy_2.0-buster/Dockerfile
index 2fc74df..386c999 100644
--- a/haproxy_2.0-buster/Dockerfile
+++ b/haproxy_2.0-buster/Dockerfile
@@ -77,7 +77,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/haproxy_2.2-alpine3.19/Dockerfile b/haproxy_2.2-alpine3.16/Dockerfile
similarity index 99%
rename from haproxy_2.2-alpine3.19/Dockerfile
rename to haproxy_2.2-alpine3.16/Dockerfile
index 8ef2113..3762d0a 100644
--- a/haproxy_2.2-alpine3.19/Dockerfile
+++ b/haproxy_2.2-alpine3.16/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.19
+FROM alpine:3.16
# roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable
RUN set -eux; \
diff --git a/haproxy_2.2-alpine3.19/docker-entrypoint.sh b/haproxy_2.2-alpine3.16/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.2-alpine3.19/docker-entrypoint.sh
rename to haproxy_2.2-alpine3.16/docker-entrypoint.sh
diff --git a/haproxy_2.2-bullseye/Dockerfile b/haproxy_2.2-bullseye/Dockerfile
index 219bcac..d612a95 100644
--- a/haproxy_2.2-bullseye/Dockerfile
+++ b/haproxy_2.2-bullseye/Dockerfile
@@ -77,7 +77,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/haproxy_2.4-bullseye/Dockerfile b/haproxy_2.4-bookworm/Dockerfile
similarity index 95%
rename from haproxy_2.4-bullseye/Dockerfile
rename to haproxy_2.4-bookworm/Dockerfile
index f8d6c22..3d15f82 100644
--- a/haproxy_2.4-bullseye/Dockerfile
+++ b/haproxy_2.4-bookworm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
# roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6
RUN set -eux; \
@@ -74,7 +74,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/haproxy_2.4-bullseye/docker-entrypoint.sh b/haproxy_2.4-bookworm/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.4-bullseye/docker-entrypoint.sh
rename to haproxy_2.4-bookworm/docker-entrypoint.sh
diff --git a/haproxy_2.6-alpine3.19/Dockerfile b/haproxy_2.6-alpine3.19/Dockerfile
index 00b3da7..0f21077 100644
--- a/haproxy_2.6-alpine3.19/Dockerfile
+++ b/haproxy_2.6-alpine3.19/Dockerfile
@@ -21,9 +21,9 @@ RUN set -eux; \
mkdir /var/lib/haproxy; \
chown haproxy:haproxy /var/lib/haproxy
-ENV HAPROXY_VERSION 2.6.15
-ENV HAPROXY_URL https://www.haproxy.org/download/2.6/src/haproxy-2.6.15.tar.gz
-ENV HAPROXY_SHA256 41f8e1695e92fafdffe39690a68993f1a0f5f7f06931a99e9a153f749ea39cfd
+ENV HAPROXY_VERSION 2.6.16
+ENV HAPROXY_URL https://www.haproxy.org/download/2.6/src/haproxy-2.6.16.tar.gz
+ENV HAPROXY_SHA256 faac6f9564caf6e106fe22c77a1fb35406afc8cd484c35c2c844aaf0d7a097fb
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
RUN set -eux; \
diff --git a/haproxy_2.6-bullseye/Dockerfile b/haproxy_2.6-bookworm/Dockerfile
similarity index 91%
rename from haproxy_2.6-bullseye/Dockerfile
rename to haproxy_2.6-bookworm/Dockerfile
index 5930056..233e7b4 100644
--- a/haproxy_2.6-bullseye/Dockerfile
+++ b/haproxy_2.6-bookworm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
# roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6
RUN set -eux; \
@@ -20,9 +20,9 @@ RUN set -eux; \
mkdir /var/lib/haproxy; \
chown haproxy:haproxy /var/lib/haproxy
-ENV HAPROXY_VERSION 2.6.15
-ENV HAPROXY_URL https://www.haproxy.org/download/2.6/src/haproxy-2.6.15.tar.gz
-ENV HAPROXY_SHA256 41f8e1695e92fafdffe39690a68993f1a0f5f7f06931a99e9a153f749ea39cfd
+ENV HAPROXY_VERSION 2.6.16
+ENV HAPROXY_URL https://www.haproxy.org/download/2.6/src/haproxy-2.6.16.tar.gz
+ENV HAPROXY_SHA256 faac6f9564caf6e106fe22c77a1fb35406afc8cd484c35c2c844aaf0d7a097fb
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
RUN set -eux; \
@@ -74,7 +74,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/haproxy_2.6-bullseye/docker-entrypoint.sh b/haproxy_2.6-bookworm/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.6-bullseye/docker-entrypoint.sh
rename to haproxy_2.6-bookworm/docker-entrypoint.sh
diff --git a/haproxy_2.7-bullseye/Dockerfile b/haproxy_2.7-bookworm/Dockerfile
similarity index 95%
rename from haproxy_2.7-bullseye/Dockerfile
rename to haproxy_2.7-bookworm/Dockerfile
index df6334e..97fff68 100644
--- a/haproxy_2.7-bullseye/Dockerfile
+++ b/haproxy_2.7-bookworm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
# roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6
RUN set -eux; \
@@ -74,7 +74,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/haproxy_2.7-bullseye/docker-entrypoint.sh b/haproxy_2.7-bookworm/docker-entrypoint.sh
similarity index 100%
rename from haproxy_2.7-bullseye/docker-entrypoint.sh
rename to haproxy_2.7-bookworm/docker-entrypoint.sh
diff --git a/haproxy_3.0-dev-bullseye/Dockerfile b/haproxy_3.0-dev-bookworm/Dockerfile
similarity index 95%
rename from haproxy_3.0-dev-bullseye/Dockerfile
rename to haproxy_3.0-dev-bookworm/Dockerfile
index 5c9ae9e..940f0c6 100644
--- a/haproxy_3.0-dev-bullseye/Dockerfile
+++ b/haproxy_3.0-dev-bookworm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
# roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6
RUN set -eux; \
@@ -74,7 +74,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/haproxy_3.0-dev-bullseye/docker-entrypoint.sh b/haproxy_3.0-dev-bookworm/docker-entrypoint.sh
similarity index 100%
rename from haproxy_3.0-dev-bullseye/docker-entrypoint.sh
rename to haproxy_3.0-dev-bookworm/docker-entrypoint.sh
diff --git a/haproxy_bullseye/Dockerfile b/haproxy_bookworm/Dockerfile
similarity index 95%
rename from haproxy_bullseye/Dockerfile
rename to haproxy_bookworm/Dockerfile
index baf9d24..067bde8 100644
--- a/haproxy_bullseye/Dockerfile
+++ b/haproxy_bookworm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
# roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6
RUN set -eux; \
@@ -74,7 +74,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/haproxy_bullseye/docker-entrypoint.sh b/haproxy_bookworm/docker-entrypoint.sh
similarity index 100%
rename from haproxy_bullseye/docker-entrypoint.sh
rename to haproxy_bookworm/docker-entrypoint.sh
diff --git a/haproxy_lts-bullseye/Dockerfile b/haproxy_lts-bookworm/Dockerfile
similarity index 95%
rename from haproxy_lts-bullseye/Dockerfile
rename to haproxy_lts-bookworm/Dockerfile
index 15abda6..62dfa03 100644
--- a/haproxy_lts-bullseye/Dockerfile
+++ b/haproxy_lts-bookworm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
# roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6
RUN set -eux; \
@@ -74,7 +74,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/haproxy_lts-bullseye/docker-entrypoint.sh b/haproxy_lts-bookworm/docker-entrypoint.sh
similarity index 100%
rename from haproxy_lts-bullseye/docker-entrypoint.sh
rename to haproxy_lts-bookworm/docker-entrypoint.shRelevant Maintainers: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: