Skip to content

Commit 9c38475

Browse files
committed
Update 2.4-rc to 2.4-dev15
1 parent fbf6af6 commit 9c38475

File tree

4 files changed

+16
-15
lines changed

4 files changed

+16
-15
lines changed

2.4-rc/Dockerfile

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

2.4-rc/alpine/Dockerfile

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile.template

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,15 @@ RUN set -eux; \
9090
USE_OPENSSL=1 \
9191
USE_PCRE2=1 USE_PCRE2_JIT=1 \
9292
USE_ZLIB=1 \
93+
{{ if env.version | startswith("2.") and ([ "2.0", "2.2", "2.3" ] | index(env.version) | not) then ( -}}
94+
USE_PROMEX=1 \
95+
{{ ) else "" end -}}
9396
\
9497
EXTRA_OBJS=" \
95-
{{ if env.version | startswith("1.") then "" else ( -}}
98+
{{ if [ "2.0", "2.2", "2.3" ] | index(env.version) then ( -}}
9699
# see https://github.com/docker-library/haproxy/issues/94#issuecomment-505673353 for more details about prometheus support
97100
contrib/prometheus-exporter/service-prometheus.o \
98-
{{ ) end -}}
101+
{{ ) else "" end -}}
99102
" \
100103
'; \
101104
{{ if env.variant == "alpine" then ( -}}

versions.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
"2.4-rc": {
3838
"alpine": "3.13",
3939
"debian": "buster-slim",
40-
"sha256": "7bc370b61cce3c37305da48966da987f822fea50fc4c9cc5d7d73bff4775dd45",
41-
"url": "https://www.haproxy.org/download/2.4/src/devel/haproxy-2.4-dev14.tar.gz",
42-
"version": "2.4-dev14"
40+
"sha256": "82f98e81f09c4df2ce3c01d9027f90d952513a2af57798e1932c4f8d555c23d6",
41+
"url": "https://www.haproxy.org/download/2.4/src/devel/haproxy-2.4-dev15.tar.gz",
42+
"version": "2.4-dev15"
4343
}
4444
}

0 commit comments

Comments
 (0)