mirror of
https://github.com/docker-library/haproxy.git
synced 2026-11-20 21:29:04 +03:00
Switch to TARGET=linux-musl for alpine
This commit is contained in:
9 files changed
+8
-18
No files matched your search
@@ -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=" \
|
||||
" \
|
||||
|
||||
@@ -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=" \
|
||||
" \
|
||||
|
||||
@@ -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=" \
|
||||
" \
|
||||
|
||||
@@ -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=" \
|
||||
" \
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user