From bfa23c19cffdb4247474b2138feeeb14f48b7fe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Fri, 17 Apr 2020 17:31:04 +0200 Subject: [PATCH] Switch to TARGET=linux-musl for alpine --- 1.6/alpine/Dockerfile | 2 -- 1.7/alpine/Dockerfile | 2 -- 1.8/alpine/Dockerfile | 2 -- 1.9/alpine/Dockerfile | 2 -- 2.0/alpine/Dockerfile | 2 -- 2.1/alpine/Dockerfile | 2 -- 2.2-rc/alpine/Dockerfile | 4 +--- Dockerfile-alpine.template | 4 +--- update.sh | 6 ++++++ 9 files changed, 8 insertions(+), 18 deletions(-) diff --git a/1.6/alpine/Dockerfile b/1.6/alpine/Dockerfile index 70e3a9e..7346d9e 100644 --- a/1.6/alpine/Dockerfile +++ b/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/1.7/alpine/Dockerfile b/1.7/alpine/Dockerfile index 92f7c88..8e7418b 100644 --- a/1.7/alpine/Dockerfile +++ b/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/1.8/alpine/Dockerfile b/1.8/alpine/Dockerfile index a5361a9..8eee967 100644 --- a/1.8/alpine/Dockerfile +++ b/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/1.9/alpine/Dockerfile b/1.9/alpine/Dockerfile index 4244a05..f34ad7b 100644 --- a/1.9/alpine/Dockerfile +++ b/1.9/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/2.0/alpine/Dockerfile b/2.0/alpine/Dockerfile index 2730312..91bc782 100644 --- a/2.0/alpine/Dockerfile +++ b/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/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile index 92f71b8..46499b4 100644 --- a/2.1/alpine/Dockerfile +++ b/2.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 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/2.2-rc/alpine/Dockerfile b/2.2-rc/alpine/Dockerfile index 4090da7..139b70c 100644 --- a/2.2-rc/alpine/Dockerfile +++ b/2.2-rc/alpine/Dockerfile @@ -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/Dockerfile-alpine.template b/Dockerfile-alpine.template index b845433..dc8b19a 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -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/update.sh b/update.sh index 9847365..265ff60 100755 --- a/update.sh +++ b/update.sh @@ -68,9 +68,15 @@ for version in "${versions[@]}"; do if [[ "$version" = 1.* ]]; then sedExpr+=' s/linux-glibc/linux2628/; + s/linux-musl/linux2628/; /prometheus/d; ' fi + if [[ "$version" =~ 2.[01] ]]; then + sedExpr+=' + s/linux-musl/linux-glibc/; + ' + fi sed -r "$sedExpr" 'Dockerfile-debian.template' > "$version/Dockerfile" for variant in alpine; do