Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update haproxy #17839

Merged
merged 1 commit into from
Nov 4, 2024
Merged

Update haproxy #17839

merged 1 commit into from
Nov 4, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Nov 4, 2024

Changes:

Changes:

- docker-library/haproxy@ae8136b: Update 3.1 to 3.1-dev11
- docker-library/haproxy@7dce106: Merge pull request docker-library/haproxy#235 from docker-library/jq-IN
- docker-library/haproxy@f9b92d6: Use jq's `IN()` instead of `index()`
@tianon tianon requested a review from a team as a code owner November 4, 2024 20:40
Copy link

github-actions bot commented Nov 4, 2024

Diff for 6c5b391:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 0bb1e02..67c88d1 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -56,12 +56,12 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 43e0f19fb557ead37a57f8d5fe8664eb25bffdc8
 Directory: 3.0/alpine
 
-Tags: 3.1-dev10, 3.1-dev, 3.1-dev10-bookworm, 3.1-dev-bookworm
+Tags: 3.1-dev11, 3.1-dev, 3.1-dev11-bookworm, 3.1-dev-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: a2995ab1bab48159a97c44e9e301714d105ec3e9
+GitCommit: ae8136b1c0383795fc02b2443dfe785a52dd08ef
 Directory: 3.1
 
-Tags: 3.1-dev10-alpine, 3.1-dev-alpine, 3.1-dev10-alpine3.20, 3.1-dev-alpine3.20
+Tags: 3.1-dev11-alpine, 3.1-dev-alpine, 3.1-dev11-alpine3.20, 3.1-dev-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: a2995ab1bab48159a97c44e9e301714d105ec3e9
+GitCommit: ae8136b1c0383795fc02b2443dfe785a52dd08ef
 Directory: 3.1/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 81052d7..92b5f71 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -43,10 +43,10 @@ haproxy:3.0.5-alpine
 haproxy:3.0.5-alpine3.20
 haproxy:3.0.5-bookworm
 haproxy:3.1-dev
-haproxy:3.1-dev10
-haproxy:3.1-dev10-alpine
-haproxy:3.1-dev10-alpine3.20
-haproxy:3.1-dev10-bookworm
+haproxy:3.1-dev11
+haproxy:3.1-dev11-alpine
+haproxy:3.1-dev11-alpine3.20
+haproxy:3.1-dev11-bookworm
 haproxy:3.1-dev-alpine
 haproxy:3.1-dev-alpine3.20
 haproxy:3.1-dev-bookworm
diff --git a/haproxy_3.1-dev-alpine3.20/Dockerfile b/haproxy_3.1-dev-alpine3.20/Dockerfile
index 48e5adb..fe09bba 100644
--- a/haproxy_3.1-dev-alpine3.20/Dockerfile
+++ b/haproxy_3.1-dev-alpine3.20/Dockerfile
@@ -28,9 +28,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 3.1-dev10
-ENV HAPROXY_URL https://www.haproxy.org/download/3.1/src/devel/haproxy-3.1-dev10.tar.gz
-ENV HAPROXY_SHA256 185b85db5092bc6dfbc4ab2e221c867caef5479bb623cc25f9d3c865b8d0be3f
+ENV HAPROXY_VERSION 3.1-dev11
+ENV HAPROXY_URL https://www.haproxy.org/download/3.1/src/devel/haproxy-3.1-dev11.tar.gz
+ENV HAPROXY_SHA256 fa03ee5355ca6168b8e74cb444ff8fa8362bce2fd11675da6c2776e64f1b3ebd
 
 # 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_3.1-dev-bookworm/Dockerfile b/haproxy_3.1-dev-bookworm/Dockerfile
index ca4f316..1b41092 100644
--- a/haproxy_3.1-dev-bookworm/Dockerfile
+++ b/haproxy_3.1-dev-bookworm/Dockerfile
@@ -29,9 +29,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 3.1-dev10
-ENV HAPROXY_URL https://www.haproxy.org/download/3.1/src/devel/haproxy-3.1-dev10.tar.gz
-ENV HAPROXY_SHA256 185b85db5092bc6dfbc4ab2e221c867caef5479bb623cc25f9d3c865b8d0be3f
+ENV HAPROXY_VERSION 3.1-dev11
+ENV HAPROXY_URL https://www.haproxy.org/download/3.1/src/devel/haproxy-3.1-dev11.tar.gz
+ENV HAPROXY_SHA256 fa03ee5355ca6168b8e74cb444ff8fa8362bce2fd11675da6c2776e64f1b3ebd
 
 # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
 RUN set -eux; \

Relevant Maintainers:

@yosifkit yosifkit merged commit dafba18 into docker-library:master Nov 4, 2024
18 checks passed
@yosifkit yosifkit deleted the haproxy branch November 4, 2024 22:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants