-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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 #18490
Merged
Merged
Update haproxy #18490
+8
−8
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
This comment has been minimized.
This comment has been minimized.
Changes: - docker-library/haproxy@e1dd4e1: Update 3.1 to 3.1.5 - docker-library/haproxy@52fe35d: Update 3.2 to 3.2-dev6 - docker-library/haproxy@2d6c0f5: Update 3.1 to 3.1.4
3687779
to
ed4271a
Compare
Diff for ed4271a:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 8881088..7fae6c4 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -56,22 +56,22 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 262506addcf26d79cf3983d5556b835d5818ee63
Directory: 3.0/alpine
-Tags: 3.1.3, 3.1, latest, 3.1.3-bookworm, 3.1-bookworm, bookworm
+Tags: 3.1.5, 3.1, latest, 3.1.5-bookworm, 3.1-bookworm, bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 9172eda0839755b609790ff159545e1f7d66d9b1
+GitCommit: e1dd4e1ca3d371d604a530397ad090cb0b0d8bda
Directory: 3.1
-Tags: 3.1.3-alpine, 3.1-alpine, alpine, 3.1.3-alpine3.21, 3.1-alpine3.21, alpine3.21
+Tags: 3.1.5-alpine, 3.1-alpine, alpine, 3.1.5-alpine3.21, 3.1-alpine3.21, alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 9172eda0839755b609790ff159545e1f7d66d9b1
+GitCommit: e1dd4e1ca3d371d604a530397ad090cb0b0d8bda
Directory: 3.1/alpine
-Tags: 3.2-dev5, 3.2-dev, 3.2-dev5-bookworm, 3.2-dev-bookworm
+Tags: 3.2-dev6, 3.2-dev, 3.2-dev6-bookworm, 3.2-dev-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: d604c89bc8794e2444c76f3421d5adde679651f9
+GitCommit: 52fe35d0664a4d6ea63e1be22508dfca73a481c4
Directory: 3.2
-Tags: 3.2-dev5-alpine, 3.2-dev-alpine, 3.2-dev5-alpine3.21, 3.2-dev-alpine3.21
+Tags: 3.2-dev6-alpine, 3.2-dev-alpine, 3.2-dev6-alpine3.21, 3.2-dev-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: d604c89bc8794e2444c76f3421d5adde679651f9
+GitCommit: 52fe35d0664a4d6ea63e1be22508dfca73a481c4
Directory: 3.2/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index b9b6a45..669832f 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -46,15 +46,15 @@ haproxy:3.1
haproxy:3.1-alpine
haproxy:3.1-alpine3.21
haproxy:3.1-bookworm
-haproxy:3.1.3
-haproxy:3.1.3-alpine
-haproxy:3.1.3-alpine3.21
-haproxy:3.1.3-bookworm
+haproxy:3.1.5
+haproxy:3.1.5-alpine
+haproxy:3.1.5-alpine3.21
+haproxy:3.1.5-bookworm
haproxy:3.2-dev
-haproxy:3.2-dev5
-haproxy:3.2-dev5-alpine
-haproxy:3.2-dev5-alpine3.21
-haproxy:3.2-dev5-bookworm
+haproxy:3.2-dev6
+haproxy:3.2-dev6-alpine
+haproxy:3.2-dev6-alpine3.21
+haproxy:3.2-dev6-bookworm
haproxy:3.2-dev-alpine
haproxy:3.2-dev-alpine3.21
haproxy:3.2-dev-bookworm
diff --git a/haproxy_3.2-dev-alpine3.21/Dockerfile b/haproxy_3.2-dev-alpine3.21/Dockerfile
index ab119a5..5c814fc 100644
--- a/haproxy_3.2-dev-alpine3.21/Dockerfile
+++ b/haproxy_3.2-dev-alpine3.21/Dockerfile
@@ -28,9 +28,9 @@ RUN set -eux; \
mkdir /var/lib/haproxy; \
chown haproxy:haproxy /var/lib/haproxy
-ENV HAPROXY_VERSION 3.2-dev5
-ENV HAPROXY_URL https://www.haproxy.org/download/3.2/src/devel/haproxy-3.2-dev5.tar.gz
-ENV HAPROXY_SHA256 c47007b577bee3ccbd7658dae4bd1e1aabb925e43c3a009e0f2c3660b9130fba
+ENV HAPROXY_VERSION 3.2-dev6
+ENV HAPROXY_URL https://www.haproxy.org/download/3.2/src/devel/haproxy-3.2-dev6.tar.gz
+ENV HAPROXY_SHA256 7b758ff26ae1da5e3e66dd0ca4e567480773a296be9a3edf63c4b39d2af52d48
# 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.2-dev-bookworm/Dockerfile b/haproxy_3.2-dev-bookworm/Dockerfile
index 1877d38..d4b0a95 100644
--- a/haproxy_3.2-dev-bookworm/Dockerfile
+++ b/haproxy_3.2-dev-bookworm/Dockerfile
@@ -29,9 +29,9 @@ RUN set -eux; \
mkdir /var/lib/haproxy; \
chown haproxy:haproxy /var/lib/haproxy
-ENV HAPROXY_VERSION 3.2-dev5
-ENV HAPROXY_URL https://www.haproxy.org/download/3.2/src/devel/haproxy-3.2-dev5.tar.gz
-ENV HAPROXY_SHA256 c47007b577bee3ccbd7658dae4bd1e1aabb925e43c3a009e0f2c3660b9130fba
+ENV HAPROXY_VERSION 3.2-dev6
+ENV HAPROXY_URL https://www.haproxy.org/download/3.2/src/devel/haproxy-3.2-dev6.tar.gz
+ENV HAPROXY_SHA256 7b758ff26ae1da5e3e66dd0ca4e567480773a296be9a3edf63c4b39d2af52d48
# 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_alpine3.21/Dockerfile b/haproxy_alpine3.21/Dockerfile
index a428e14..03ca525 100644
--- a/haproxy_alpine3.21/Dockerfile
+++ b/haproxy_alpine3.21/Dockerfile
@@ -28,9 +28,9 @@ RUN set -eux; \
mkdir /var/lib/haproxy; \
chown haproxy:haproxy /var/lib/haproxy
-ENV HAPROXY_VERSION 3.1.3
-ENV HAPROXY_URL https://www.haproxy.org/download/3.1/src/haproxy-3.1.3.tar.gz
-ENV HAPROXY_SHA256 6dd21f9a41f0ec7289650e299180b64f9dd225e35113fd1bddc6a3a2e79d5172
+ENV HAPROXY_VERSION 3.1.5
+ENV HAPROXY_URL https://www.haproxy.org/download/3.1/src/haproxy-3.1.5.tar.gz
+ENV HAPROXY_SHA256 36e2816f697f389233137dc7ec9559faa7703243395ad129af091b63f4f099cf
# 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_bookworm/Dockerfile b/haproxy_bookworm/Dockerfile
index a57bed8..aa2bec0 100644
--- a/haproxy_bookworm/Dockerfile
+++ b/haproxy_bookworm/Dockerfile
@@ -29,9 +29,9 @@ RUN set -eux; \
mkdir /var/lib/haproxy; \
chown haproxy:haproxy /var/lib/haproxy
-ENV HAPROXY_VERSION 3.1.3
-ENV HAPROXY_URL https://www.haproxy.org/download/3.1/src/haproxy-3.1.3.tar.gz
-ENV HAPROXY_SHA256 6dd21f9a41f0ec7289650e299180b64f9dd225e35113fd1bddc6a3a2e79d5172
+ENV HAPROXY_VERSION 3.1.5
+ENV HAPROXY_URL https://www.haproxy.org/download/3.1/src/haproxy-3.1.5.tar.gz
+ENV HAPROXY_SHA256 36e2816f697f389233137dc7ec9559faa7703243395ad129af091b63f4f099cf
# 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
approved these changes
Feb 21, 2025
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: