Merge pull request #111 from TimWolla/target-musl

tianon · web-flow · commit 6cd53edc2922 · 2020-04-17T12:02:22.000-07:00
Switch to TARGET=linux-musl for alpine
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,6 @@ RUN set -x \`
`35`	`35`	`USE_OPENSSL=1 \`
`36`	`36`	`USE_PCRE2=1 USE_PCRE2_JIT=1 \`
`37`	`37`	`USE_ZLIB=1 \`
`38`		`-# USE_BACKTRACE is enabled by default on the linux2628 target, but does not work with musl`
`39`		`- USE_BACKTRACE= \`
`40`	`38`	`\`
`41`	`39`	`EXTRA_OBJS=" \`
`42`	`40`	`" \`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,6 @@ RUN set -x \`
`36`	`36`	`USE_OPENSSL=1 \`
`37`	`37`	`USE_PCRE2=1 USE_PCRE2_JIT=1 \`
`38`	`38`	`USE_ZLIB=1 \`
`39`		`-# USE_BACKTRACE is enabled by default on the linux2628 target, but does not work with musl`
`40`		`- USE_BACKTRACE= \`
`41`	`39`	`\`
`42`	`40`	`EXTRA_OBJS=" \`
`43`	`41`	`" \`