Update haproxy #7840
Merged
Update haproxy #7840
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@6cd53ed: Merge pull request docker-library/haproxy#111 from TimWolla/target-musl - docker-library/haproxy@bfa23c1: Switch to TARGET=linux-musl for alpine - docker-library/haproxy@eaec0e4: Update to 2.2-dev6
Diff:diff --git a/_bashbrew-list b/_bashbrew-list
index 58dd335..ee52934 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -24,8 +24,8 @@ haproxy:2.1
haproxy:2.1-alpine
haproxy:2.1.4
haproxy:2.1.4-alpine
-haproxy:2.2-dev5
-haproxy:2.2-dev5-alpine
+haproxy:2.2-dev6
+haproxy:2.2-dev6-alpine
haproxy:2.2-rc
haproxy:2.2-rc-alpine
haproxy:alpine
diff --git a/haproxy_1-alpine/Dockerfile b/haproxy_1-alpine/Dockerfile
index 4244a05..f34ad7b 100644
--- a/haproxy_1-alpine/Dockerfile
+++ b/haproxy_1-alpine/Dockerfile
@@ -35,8 +35,6 @@ RUN set -x \
USE_OPENSSL=1 \
USE_PCRE2=1 USE_PCRE2_JIT=1 \
USE_ZLIB=1 \
-# USE_BACKTRACE is enabled by default on the linux2628 target, but does not work with musl
- USE_BACKTRACE= \
\
EXTRA_OBJS=" \
" \
diff --git a/haproxy_1.6-alpine/Dockerfile b/haproxy_1.6-alpine/Dockerfile
index 70e3a9e..7346d9e 100644
--- a/haproxy_1.6-alpine/Dockerfile
+++ b/haproxy_1.6-alpine/Dockerfile
@@ -35,8 +35,6 @@ RUN set -x \
USE_OPENSSL=1 \
USE_PCRE2=1 USE_PCRE2_JIT=1 \
USE_ZLIB=1 \
-# USE_BACKTRACE is enabled by default on the linux2628 target, but does not work with musl
- USE_BACKTRACE= \
\
EXTRA_OBJS=" \
" \
diff --git a/haproxy_1.7-alpine/Dockerfile b/haproxy_1.7-alpine/Dockerfile
index 92f7c88..8e7418b 100644
--- a/haproxy_1.7-alpine/Dockerfile
+++ b/haproxy_1.7-alpine/Dockerfile
@@ -36,8 +36,6 @@ RUN set -x \
USE_OPENSSL=1 \
USE_PCRE2=1 USE_PCRE2_JIT=1 \
USE_ZLIB=1 \
-# USE_BACKTRACE is enabled by default on the linux2628 target, but does not work with musl
- USE_BACKTRACE= \
\
EXTRA_OBJS=" \
" \
diff --git a/haproxy_1.8-alpine/Dockerfile b/haproxy_1.8-alpine/Dockerfile
index a5361a9..8eee967 100644
--- a/haproxy_1.8-alpine/Dockerfile
+++ b/haproxy_1.8-alpine/Dockerfile
@@ -35,8 +35,6 @@ RUN set -x \
USE_OPENSSL=1 \
USE_PCRE2=1 USE_PCRE2_JIT=1 \
USE_ZLIB=1 \
-# USE_BACKTRACE is enabled by default on the linux2628 target, but does not work with musl
- USE_BACKTRACE= \
\
EXTRA_OBJS=" \
" \
diff --git a/haproxy_2.0-alpine/Dockerfile b/haproxy_2.0-alpine/Dockerfile
index 2730312..91bc782 100644
--- a/haproxy_2.0-alpine/Dockerfile
+++ b/haproxy_2.0-alpine/Dockerfile
@@ -35,8 +35,6 @@ RUN set -x \
USE_OPENSSL=1 \
USE_PCRE2=1 USE_PCRE2_JIT=1 \
USE_ZLIB=1 \
-# USE_BACKTRACE is enabled by default on the linux-glibc target, but does not work with musl
- USE_BACKTRACE= \
\
EXTRA_OBJS=" \
# see https://github.com/docker-library/haproxy/issues/94#issuecomment-505673353 for more details about prometheus support
diff --git a/haproxy_2.2-rc-alpine/Dockerfile b/haproxy_2.2-rc-alpine/Dockerfile
index f30e9c4..139b70c 100644
--- a/haproxy_2.2-rc-alpine/Dockerfile
+++ b/haproxy_2.2-rc-alpine/Dockerfile
@@ -1,9 +1,9 @@
# vim:set ft=dockerfile:
FROM alpine:3.11
-ENV HAPROXY_VERSION 2.2-dev5
-ENV HAPROXY_URL https://www.haproxy.org/download/2.2/src/devel/haproxy-2.2-dev5.tar.gz
-ENV HAPROXY_SHA256 21ca1d2cfa56bc164ee9931300972c99e51b966408f05784eb16f581b6f62c7d
+ENV HAPROXY_VERSION 2.2-dev6
+ENV HAPROXY_URL https://www.haproxy.org/download/2.2/src/devel/haproxy-2.2-dev6.tar.gz
+ENV HAPROXY_SHA256 777f6312671c3c7e9c32bcb4f8ae9f487f2311b8d5a8d1b1cef98833f45968ee
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
RUN set -x \
@@ -29,14 +29,12 @@ RUN set -x \
&& rm haproxy.tar.gz \
\
&& makeOpts=' \
- TARGET=linux-glibc \
+ TARGET=linux-musl \
USE_GETADDRINFO=1 \
USE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 \
USE_OPENSSL=1 \
USE_PCRE2=1 USE_PCRE2_JIT=1 \
USE_ZLIB=1 \
-# USE_BACKTRACE is enabled by default on the linux-glibc target, but does not work with musl
- USE_BACKTRACE= \
\
EXTRA_OBJS=" \
# see https://github.com/docker-library/haproxy/issues/94#issuecomment-505673353 for more details about prometheus support
diff --git a/haproxy_2.2-rc/Dockerfile b/haproxy_2.2-rc/Dockerfile
index f072b72..9ca6d72 100644
--- a/haproxy_2.2-rc/Dockerfile
+++ b/haproxy_2.2-rc/Dockerfile
@@ -1,9 +1,9 @@
# vim:set ft=dockerfile:
FROM debian:buster-slim
-ENV HAPROXY_VERSION 2.2-dev5
-ENV HAPROXY_URL https://www.haproxy.org/download/2.2/src/devel/haproxy-2.2-dev5.tar.gz
-ENV HAPROXY_SHA256 21ca1d2cfa56bc164ee9931300972c99e51b966408f05784eb16f581b6f62c7d
+ENV HAPROXY_VERSION 2.2-dev6
+ENV HAPROXY_URL https://www.haproxy.org/download/2.2/src/devel/haproxy-2.2-dev6.tar.gz
+ENV HAPROXY_SHA256 777f6312671c3c7e9c32bcb4f8ae9f487f2311b8d5a8d1b1cef98833f45968ee
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
RUN set -x \
diff --git a/haproxy_alpine/Dockerfile b/haproxy_alpine/Dockerfile
index 92f71b8..46499b4 100644
--- a/haproxy_alpine/Dockerfile
+++ b/haproxy_alpine/Dockerfile
@@ -35,8 +35,6 @@ RUN set -x \
USE_OPENSSL=1 \
USE_PCRE2=1 USE_PCRE2_JIT=1 \
USE_ZLIB=1 \
-# USE_BACKTRACE is enabled by default on the linux-glibc target, but does not work with musl
- USE_BACKTRACE= \
\
EXTRA_OBJS=" \
# see https://github.com/docker-library/haproxy/issues/94#issuecomment-505673353 for more details about prometheus support |
|
Build test of #7840; 2b3a1e5; $ bashbrew build haproxy:2.2-dev6
Building bashbrew/cache:3e5e9cac3ff6fc11b1cc6b91836c3da64703f36cec53d28c81848e8325247196 (haproxy:2.2-dev6)
Tagging haproxy:2.2-dev6
Tagging haproxy:2.2-rc
$ test/run.sh haproxy:2.2-dev6
testing haproxy:2.2-dev6
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'haproxy-basics' [5/5]...passed
$ bashbrew build haproxy:2.2-dev6-alpine
Building bashbrew/cache:03c81dbf2854e5d7e0d2f31ee97dd48c7611e6f66fa6f0005958560704979a42 (haproxy:2.2-dev6-alpine)
Tagging haproxy:2.2-dev6-alpine
Tagging haproxy:2.2-rc-alpine
$ test/run.sh haproxy:2.2-dev6-alpine
testing haproxy:2.2-dev6-alpine
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'haproxy-basics' [5/5]...passed
$ bashbrew build haproxy:2.1.4
Using bashbrew/cache:81efe790eded71f0ae1ec9c530997e25e5fa451cb02107376e8cfc7bf7ba0533 (haproxy:2.1.4)
Tagging haproxy:2.1.4
Tagging haproxy:2.1
Tagging haproxy:latest
$ test/run.sh haproxy:2.1.4
testing haproxy:2.1.4
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'haproxy-basics' [5/5]...passed
$ bashbrew build haproxy:2.1.4-alpine
Building bashbrew/cache:52b8aa54def357509679833220db86dc0d9946b37d8d575aa7415a92825563de (haproxy:2.1.4-alpine)
Tagging haproxy:2.1.4-alpine
Tagging haproxy:2.1-alpine
Tagging haproxy:alpine
$ test/run.sh haproxy:2.1.4-alpine
testing haproxy:2.1.4-alpine
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'haproxy-basics' [5/5]...passed
$ bashbrew build haproxy:2.0.14
Using bashbrew/cache:882fa68da26eaa509cf7c37fdd21484188a24c43b442f9a7134df03636dd2290 (haproxy:2.0.14)
Tagging haproxy:2.0.14
Tagging haproxy:2.0
$ test/run.sh haproxy:2.0.14
testing haproxy:2.0.14
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'haproxy-basics' [5/5]...passed
$ bashbrew build haproxy:2.0.14-alpine
Building bashbrew/cache:760de9f1c931ca7fbbf2bb03ce2c7c625407a793ab73f32a50180d5acdf809e2 (haproxy:2.0.14-alpine)
Tagging haproxy:2.0.14-alpine
Tagging haproxy:2.0-alpine
$ test/run.sh haproxy:2.0.14-alpine
testing haproxy:2.0.14-alpine
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'haproxy-basics' [5/5]...passed
$ bashbrew build haproxy:1.9.15
Using bashbrew/cache:4e10a68f103ae560bca8cc962f9781b30b0f8ae9ad88d470b0049f97b60d4c50 (haproxy:1.9.15)
Tagging haproxy:1.9.15
Tagging haproxy:1.9
Tagging haproxy:1
$ test/run.sh haproxy:1.9.15
testing haproxy:1.9.15
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'haproxy-basics' [5/5]...passed
$ bashbrew build haproxy:1.9.15-alpine
Building bashbrew/cache:c9cb61660a102a7dd4e1240bd624463189aafa3234d040406ab1d3e6640a4896 (haproxy:1.9.15-alpine)
Tagging haproxy:1.9.15-alpine
Tagging haproxy:1.9-alpine
Tagging haproxy:1-alpine
$ test/run.sh haproxy:1.9.15-alpine
testing haproxy:1.9.15-alpine
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'haproxy-basics' [5/5]...passed
$ bashbrew build haproxy:1.8.25
Using bashbrew/cache:2eb8bee402c2bb8277ec8c89f1da4fe98d8eede66b4c4ac46b1ce5faac763f43 (haproxy:1.8.25)
Tagging haproxy:1.8.25
Tagging haproxy:1.8
$ test/run.sh haproxy:1.8.25
testing haproxy:1.8.25
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'haproxy-basics' [5/5]...passed
$ bashbrew build haproxy:1.8.25-alpine
Building bashbrew/cache:0d0b23ec051c43cf695f86aa847a4e22a209f4bfbec516d4114643bc9288b187 (haproxy:1.8.25-alpine)
Tagging haproxy:1.8.25-alpine
Tagging haproxy:1.8-alpine
$ test/run.sh haproxy:1.8.25-alpine
testing haproxy:1.8.25-alpine
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'haproxy-basics' [5/5]...passed
$ bashbrew build haproxy:1.7.12
Using bashbrew/cache:3ab45e60f6a409d2b69136db540dc583e0ac94713c1827708714e3781ba8d197 (haproxy:1.7.12)
Tagging haproxy:1.7.12
Tagging haproxy:1.7
$ test/run.sh haproxy:1.7.12
testing haproxy:1.7.12
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'haproxy-basics' [5/5]...passed
$ bashbrew build haproxy:1.7.12-alpine
Building bashbrew/cache:0b402080feb867374eba50b32b03a09de0db4662af75d2a20021ae93302b4973 (haproxy:1.7.12-alpine)
Tagging haproxy:1.7.12-alpine
Tagging haproxy:1.7-alpine
$ test/run.sh haproxy:1.7.12-alpine
testing haproxy:1.7.12-alpine
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'haproxy-basics' [5/5]...passed
$ bashbrew build haproxy:1.6.15
Using bashbrew/cache:d5c564fa6d990fe8d46df5ea42e5f402e6581c611a8d36a56bb5514ab144f77f (haproxy:1.6.15)
Tagging haproxy:1.6.15
Tagging haproxy:1.6
$ test/run.sh haproxy:1.6.15
testing haproxy:1.6.15
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'haproxy-basics' [5/5]...passed
$ bashbrew build haproxy:1.6.15-alpine
Building bashbrew/cache:9a812e60a149a136e8d5ebcb3000692e371e28d9e30383b47effa80f08f7a8e2 (haproxy:1.6.15-alpine)
Tagging haproxy:1.6.15-alpine
Tagging haproxy:1.6-alpine
$ test/run.sh haproxy:1.6.15-alpine
testing haproxy:1.6.15-alpine
'utc' [1/5]...passed
'cve-2014--shellshock' [2/5]...passed
'no-hard-coded-passwords' [3/5]...passed
'override-cmd' [4/5]...passed
'haproxy-basics' [5/5]...passed
|
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: