Merge pull request #152 from TimWolla/haproxy-2.4

Update 2.4-rc to 2.4-dev15
This commit is contained in:
Tianon Gravi authored and GitHub committed 2021-04-05 10:10:27 -07:00
commit 07bb9aa461
4 files changed
+16 -15

No files matched your search

+4 -5
View File
@@ -17,9 +17,9 @@ RUN set -eux; \
--uid 99 \
haproxy
ENV HAPROXY_VERSION 2.4-dev14
ENV HAPROXY_URL https://www.haproxy.org/download/2.4/src/devel/haproxy-2.4-dev14.tar.gz
ENV HAPROXY_SHA256 7bc370b61cce3c37305da48966da987f822fea50fc4c9cc5d7d73bff4775dd45
ENV HAPROXY_VERSION 2.4-dev15
ENV HAPROXY_URL https://www.haproxy.org/download/2.4/src/devel/haproxy-2.4-dev15.tar.gz
ENV HAPROXY_SHA256 82f98e81f09c4df2ce3c01d9027f90d952513a2af57798e1932c4f8d555c23d6
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
RUN set -eux; \
@@ -51,10 +51,9 @@ RUN set -eux; \
USE_OPENSSL=1 \
USE_PCRE2=1 USE_PCRE2_JIT=1 \
USE_ZLIB=1 \
USE_PROMEX=1 \
\
EXTRA_OBJS=" \
# see https://github.com/docker-library/haproxy/issues/94#issuecomment-505673353 for more details about prometheus support
contrib/prometheus-exporter/service-prometheus.o \
" \
'; \
# https://salsa.debian.org/haproxy-team/haproxy/-/commit/53988af3d006ebcbf2c941e34121859fd6379c70
+4 -5
View File
@@ -18,9 +18,9 @@ RUN set -eux; \
--uid 99 \
haproxy
ENV HAPROXY_VERSION 2.4-dev14
ENV HAPROXY_URL https://www.haproxy.org/download/2.4/src/devel/haproxy-2.4-dev14.tar.gz
ENV HAPROXY_SHA256 7bc370b61cce3c37305da48966da987f822fea50fc4c9cc5d7d73bff4775dd45
ENV HAPROXY_VERSION 2.4-dev15
ENV HAPROXY_URL https://www.haproxy.org/download/2.4/src/devel/haproxy-2.4-dev15.tar.gz
ENV HAPROXY_SHA256 82f98e81f09c4df2ce3c01d9027f90d952513a2af57798e1932c4f8d555c23d6
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
RUN set -eux; \
@@ -52,10 +52,9 @@ RUN set -eux; \
USE_OPENSSL=1 \
USE_PCRE2=1 USE_PCRE2_JIT=1 \
USE_ZLIB=1 \
USE_PROMEX=1 \
\
EXTRA_OBJS=" \
# see https://github.com/docker-library/haproxy/issues/94#issuecomment-505673353 for more details about prometheus support
contrib/prometheus-exporter/service-prometheus.o \
" \
'; \
\
+5 -2
View File
@@ -90,12 +90,15 @@ RUN set -eux; \
USE_OPENSSL=1 \
USE_PCRE2=1 USE_PCRE2_JIT=1 \
USE_ZLIB=1 \
{{ if env.version | startswith("2.") and ([ "2.0", "2.2", "2.3" ] | index(env.version) | not) then ( -}}
USE_PROMEX=1 \
{{ ) else "" end -}}
\
EXTRA_OBJS=" \
{{ if env.version | startswith("1.") then "" else ( -}}
{{ if [ "2.0", "2.2", "2.3" ] | index(env.version) then ( -}}
# see https://github.com/docker-library/haproxy/issues/94#issuecomment-505673353 for more details about prometheus support
contrib/prometheus-exporter/service-prometheus.o \
{{ ) end -}}
{{ ) else "" end -}}
" \
'; \
{{ if env.variant == "alpine" then ( -}}
+3 -3
View File
@@ -37,8 +37,8 @@
"2.4-rc": {
"alpine": "3.13",
"debian": "buster-slim",
"sha256": "7bc370b61cce3c37305da48966da987f822fea50fc4c9cc5d7d73bff4775dd45",
"url": "https://www.haproxy.org/download/2.4/src/devel/haproxy-2.4-dev14.tar.gz",
"version": "2.4-dev14"
"sha256": "82f98e81f09c4df2ce3c01d9027f90d952513a2af57798e1932c4f8d555c23d6",
"url": "https://www.haproxy.org/download/2.4/src/devel/haproxy-2.4-dev15.tar.gz",
"version": "2.4-dev15"
}
}