Update haproxy #15940
Merged
Update haproxy #15940
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@edf0471: Update 2.2 to 2.2.32 - docker-library/haproxy@1689052: Update 2.0 to 2.0.34 - docker-library/haproxy@66c5b5e: Merge pull request docker-library/haproxy#215 from Darlelet/master
Diff for 7eab664:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 69dd7c2..f6cc2b3 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,24 +1,24 @@
Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
GitRepo: https://github.com/docker-library/haproxy.git
-Tags: 2.0.33, 2.0, 2.0.33-buster, 2.0-buster
+Tags: 2.0.34, 2.0, 2.0.34-buster, 2.0-buster
Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 71aadfadc524b2bec5a4d6e620d1f9a22f431c27
+GitCommit: 1689052e242008bfabfd0259acdbcf0bf69a1743
Directory: 2.0
-Tags: 2.0.33-alpine, 2.0-alpine, 2.0.33-alpine3.16, 2.0-alpine3.16
+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: 9c85db58f62beefbcbc4fabc5697ddaeb9ff3ff2
+GitCommit: 1689052e242008bfabfd0259acdbcf0bf69a1743
Directory: 2.0/alpine
-Tags: 2.2.31, 2.2, 2.2.31-bullseye, 2.2-bullseye
+Tags: 2.2.32, 2.2, 2.2.32-bullseye, 2.2-bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 37ba32b245a7c55a5a42a554795d7140acbf4113
+GitCommit: edf0471abcc8d46fec439f9bddffa0d57da97053
Directory: 2.2
-Tags: 2.2.31-alpine, 2.2-alpine, 2.2.31-alpine3.16, 2.2-alpine3.16
+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: 37ba32b245a7c55a5a42a554795d7140acbf4113
+GitCommit: edf0471abcc8d46fec439f9bddffa0d57da97053
Directory: 2.2/alpine
Tags: 2.4.25, 2.4, 2.4.25-bookworm, 2.4-bookworm
@@ -63,20 +63,20 @@ 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: 7643b2d41ab7eb48e2ebfe2ce99ca453a125993c
+GitCommit: 66c5b5e84b5f86a8047f5d8f9472e5fa6e3711e8
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: 7643b2d41ab7eb48e2ebfe2ce99ca453a125993c
+GitCommit: 66c5b5e84b5f86a8047f5d8f9472e5fa6e3711e8
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: 71aadfadc524b2bec5a4d6e620d1f9a22f431c27
+GitCommit: 0d5ae965f4941abfe179b11761bfec9c5ef191ff
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: 4df9df86887f5422e63e3522f1f958ce735b8ebb
+GitCommit: 0d5ae965f4941abfe179b11761bfec9c5ef191ff
Directory: 3.0/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index bca9c30..40ece87 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,18 +2,18 @@ haproxy:2.0
haproxy:2.0-alpine
haproxy:2.0-alpine3.16
haproxy:2.0-buster
-haproxy:2.0.33
-haproxy:2.0.33-alpine
-haproxy:2.0.33-alpine3.16
-haproxy:2.0.33-buster
+haproxy:2.0.34
+haproxy:2.0.34-alpine
+haproxy:2.0.34-alpine3.16
+haproxy:2.0.34-buster
haproxy:2.2
haproxy:2.2-alpine
haproxy:2.2-alpine3.16
haproxy:2.2-bullseye
-haproxy:2.2.31
-haproxy:2.2.31-alpine
-haproxy:2.2.31-alpine3.16
-haproxy:2.2.31-bullseye
+haproxy:2.2.32
+haproxy:2.2.32-alpine
+haproxy:2.2.32-alpine3.16
+haproxy:2.2.32-bullseye
haproxy:2.4
haproxy:2.4-alpine
haproxy:2.4-alpine3.19
diff --git a/haproxy_2.0-alpine3.16/Dockerfile b/haproxy_2.0-alpine3.16/Dockerfile
index 147a8a9..bf8e3c1 100644
--- a/haproxy_2.0-alpine3.16/Dockerfile
+++ b/haproxy_2.0-alpine3.16/Dockerfile
@@ -21,9 +21,9 @@ RUN set -eux; \
mkdir /var/lib/haproxy; \
chown haproxy:haproxy /var/lib/haproxy
-ENV HAPROXY_VERSION 2.0.33
-ENV HAPROXY_URL https://www.haproxy.org/download/2.0/src/haproxy-2.0.33.tar.gz
-ENV HAPROXY_SHA256 32f80854d89ce8bbe95f58be0b933b97daa78fe0ec5d7d8315ba5e6bdc718ee7
+ENV HAPROXY_VERSION 2.0.34
+ENV HAPROXY_URL https://www.haproxy.org/download/2.0/src/haproxy-2.0.34.tar.gz
+ENV HAPROXY_SHA256 8504cab272adeed9400736e06d2231c17775a8458146681ca0f92a9bbc9c7fd5
# 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.0-buster/Dockerfile b/haproxy_2.0-buster/Dockerfile
index 386c999..c760bc5 100644
--- a/haproxy_2.0-buster/Dockerfile
+++ b/haproxy_2.0-buster/Dockerfile
@@ -20,9 +20,9 @@ RUN set -eux; \
mkdir /var/lib/haproxy; \
chown haproxy:haproxy /var/lib/haproxy
-ENV HAPROXY_VERSION 2.0.33
-ENV HAPROXY_URL https://www.haproxy.org/download/2.0/src/haproxy-2.0.33.tar.gz
-ENV HAPROXY_SHA256 32f80854d89ce8bbe95f58be0b933b97daa78fe0ec5d7d8315ba5e6bdc718ee7
+ENV HAPROXY_VERSION 2.0.34
+ENV HAPROXY_URL https://www.haproxy.org/download/2.0/src/haproxy-2.0.34.tar.gz
+ENV HAPROXY_SHA256 8504cab272adeed9400736e06d2231c17775a8458146681ca0f92a9bbc9c7fd5
# 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.2-alpine3.16/Dockerfile b/haproxy_2.2-alpine3.16/Dockerfile
index 3762d0a..d6b7ab5 100644
--- a/haproxy_2.2-alpine3.16/Dockerfile
+++ b/haproxy_2.2-alpine3.16/Dockerfile
@@ -21,9 +21,9 @@ RUN set -eux; \
mkdir /var/lib/haproxy; \
chown haproxy:haproxy /var/lib/haproxy
-ENV HAPROXY_VERSION 2.2.31
-ENV HAPROXY_URL https://www.haproxy.org/download/2.2/src/haproxy-2.2.31.tar.gz
-ENV HAPROXY_SHA256 94b099e0142c3e5689b2a1a4943eafa02a453b342e6527cd108b722f8d0a82f6
+ENV HAPROXY_VERSION 2.2.32
+ENV HAPROXY_URL https://www.haproxy.org/download/2.2/src/haproxy-2.2.32.tar.gz
+ENV HAPROXY_SHA256 847620a0990bf6c274ac2cd9fdebc69fa7749ac02da534263a6b275554932efc
# 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.2-bullseye/Dockerfile b/haproxy_2.2-bullseye/Dockerfile
index d612a95..24ce9dd 100644
--- a/haproxy_2.2-bullseye/Dockerfile
+++ b/haproxy_2.2-bullseye/Dockerfile
@@ -20,9 +20,9 @@ RUN set -eux; \
mkdir /var/lib/haproxy; \
chown haproxy:haproxy /var/lib/haproxy
-ENV HAPROXY_VERSION 2.2.31
-ENV HAPROXY_URL https://www.haproxy.org/download/2.2/src/haproxy-2.2.31.tar.gz
-ENV HAPROXY_SHA256 94b099e0142c3e5689b2a1a4943eafa02a453b342e6527cd108b722f8d0a82f6
+ENV HAPROXY_VERSION 2.2.32
+ENV HAPROXY_URL https://www.haproxy.org/download/2.2/src/haproxy-2.2.32.tar.gz
+ENV HAPROXY_SHA256 847620a0990bf6c274ac2cd9fdebc69fa7749ac02da534263a6b275554932efc
# 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.0-dev-alpine3.19/Dockerfile b/haproxy_3.0-dev-alpine3.19/Dockerfile
index e6063e7..4770ab7 100644
--- a/haproxy_3.0-dev-alpine3.19/Dockerfile
+++ b/haproxy_3.0-dev-alpine3.19/Dockerfile
@@ -32,7 +32,7 @@ RUN set -eux; \
gcc \
libc-dev \
linux-headers \
- lua5.3-dev \
+ lua5.4-dev \
make \
openssl \
openssl-dev \
@@ -50,7 +50,7 @@ RUN set -eux; \
makeOpts=' \
TARGET=linux-musl \
USE_GETADDRINFO=1 \
- USE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 \
+ USE_LUA=1 LUA_INC=/usr/include/lua5.4 LUA_LIB=/usr/lib/lua5.4 \
USE_OPENSSL=1 \
USE_PCRE2=1 USE_PCRE2_JIT=1 \
USE_PROMEX=1 \
diff --git a/haproxy_3.0-dev-bookworm/Dockerfile b/haproxy_3.0-dev-bookworm/Dockerfile
index 940f0c6..8865a4c 100644
--- a/haproxy_3.0-dev-bookworm/Dockerfile
+++ b/haproxy_3.0-dev-bookworm/Dockerfile
@@ -32,7 +32,7 @@ RUN set -eux; \
ca-certificates \
gcc \
libc6-dev \
- liblua5.3-dev \
+ liblua5.4-dev \
libpcre2-dev \
libssl-dev \
make \
@@ -49,7 +49,7 @@ RUN set -eux; \
makeOpts=' \
TARGET=linux-glibc \
USE_GETADDRINFO=1 \
- USE_LUA=1 LUA_INC=/usr/include/lua5.3 \
+ USE_LUA=1 LUA_INC=/usr/include/lua5.4 \
USE_OPENSSL=1 \
USE_PCRE2=1 USE_PCRE2_JIT=1 \
USE_PROMEX=1 \
diff --git a/haproxy_alpine3.19/Dockerfile b/haproxy_alpine3.19/Dockerfile
index 2191453..644e13b 100644
--- a/haproxy_alpine3.19/Dockerfile
+++ b/haproxy_alpine3.19/Dockerfile
@@ -32,7 +32,7 @@ RUN set -eux; \
gcc \
libc-dev \
linux-headers \
- lua5.3-dev \
+ lua5.4-dev \
make \
openssl \
openssl-dev \
@@ -50,7 +50,7 @@ RUN set -eux; \
makeOpts=' \
TARGET=linux-musl \
USE_GETADDRINFO=1 \
- USE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 \
+ USE_LUA=1 LUA_INC=/usr/include/lua5.4 LUA_LIB=/usr/lib/lua5.4 \
USE_OPENSSL=1 \
USE_PCRE2=1 USE_PCRE2_JIT=1 \
USE_PROMEX=1 \
diff --git a/haproxy_bookworm/Dockerfile b/haproxy_bookworm/Dockerfile
index 58fddb1..0417214 100644
--- a/haproxy_bookworm/Dockerfile
+++ b/haproxy_bookworm/Dockerfile
@@ -32,7 +32,7 @@ RUN set -eux; \
ca-certificates \
gcc \
libc6-dev \
- liblua5.3-dev \
+ liblua5.4-dev \
libpcre2-dev \
libssl-dev \
make \
@@ -49,7 +49,7 @@ RUN set -eux; \
makeOpts=' \
TARGET=linux-glibc \
USE_GETADDRINFO=1 \
- USE_LUA=1 LUA_INC=/usr/include/lua5.3 \
+ USE_LUA=1 LUA_INC=/usr/include/lua5.4 \
USE_OPENSSL=1 \
USE_PCRE2=1 USE_PCRE2_JIT=1 \
USE_PROMEX=1 \Relevant Maintainers: |
yosifkit
approved these changes
Dec 19, 2023
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: