Switch to TARGET=linux-musl for alpine

This commit is contained in:
Tim Düsterhus committed 2020-04-17 19:36:18 +02:00
1 parent eaec0e4daa
commit bfa23c19cf
9 files changed
+8 -18

No files matched your search

-2
View File
@@ -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=" \
" \
-2
View File
@@ -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=" \
" \
-2
View File
@@ -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=" \
" \
-2
View File
@@ -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=" \
" \
-2
View File
@@ -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
-2
View File
@@ -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
+1 -3
View File
@@ -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
+1 -3
View File
@@ -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
+6
View File
@@ -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