From d21ad4557dd2ea46cba1f05a75dcd39ee42c5c56 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 26 Jun 2019 03:28:58 -0700 Subject: [PATCH] Enable the inclusion of "contrib/prometheus-exporter/service-prometheus.o" on 2+ --- 1.5/Dockerfile | 8 ++++++-- 1.5/alpine/Dockerfile | 8 ++++++-- 1.6/Dockerfile | 10 +++++++--- 1.6/alpine/Dockerfile | 10 +++++++--- 1.7/Dockerfile | 10 +++++++--- 1.7/alpine/Dockerfile | 10 +++++++--- 1.8/Dockerfile | 10 +++++++--- 1.8/alpine/Dockerfile | 10 +++++++--- 1.9/Dockerfile | 10 +++++++--- 1.9/alpine/Dockerfile | 10 +++++++--- 2.0/Dockerfile | 12 +++++++++--- 2.0/alpine/Dockerfile | 12 +++++++++--- Dockerfile-alpine.template | 12 +++++++++--- Dockerfile-debian.template | 12 +++++++++--- update.sh | 1 + 15 files changed, 105 insertions(+), 40 deletions(-) diff --git a/1.5/Dockerfile b/1.5/Dockerfile index 2e5c9eb..36ffeb6 100644 --- a/1.5/Dockerfile +++ b/1.5/Dockerfile @@ -32,9 +32,13 @@ RUN set -x \ USE_OPENSSL=1 \ USE_PCRE2=1 USE_PCRE2_JIT=1 \ USE_ZLIB=1 \ + \ + EXTRA_OBJS=" \ + " \ ' \ - && make -C /usr/src/haproxy -j "$(nproc)" all $makeOpts \ - && make -C /usr/src/haproxy install-bin $makeOpts \ + && nproc="$(nproc)" \ + && eval "make -C /usr/src/haproxy -j '$nproc' all $makeOpts" \ + && eval "make -C /usr/src/haproxy install-bin $makeOpts" \ \ && mkdir -p /usr/local/etc/haproxy \ && cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \ diff --git a/1.5/alpine/Dockerfile b/1.5/alpine/Dockerfile index e661514..db7b960 100644 --- a/1.5/alpine/Dockerfile +++ b/1.5/alpine/Dockerfile @@ -33,9 +33,13 @@ RUN set -x \ USE_OPENSSL=1 \ USE_PCRE2=1 USE_PCRE2_JIT=1 \ USE_ZLIB=1 \ + \ + EXTRA_OBJS=" \ + " \ ' \ - && make -C /usr/src/haproxy -j "$(getconf _NPROCESSORS_ONLN)" all $makeOpts \ - && make -C /usr/src/haproxy install-bin $makeOpts \ + && nproc="$(getconf _NPROCESSORS_ONLN)" \ + && eval "make -C /usr/src/haproxy -j '$nproc' all $makeOpts" \ + && eval "make -C /usr/src/haproxy install-bin $makeOpts" \ \ && mkdir -p /usr/local/etc/haproxy \ && cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \ diff --git a/1.6/Dockerfile b/1.6/Dockerfile index afa13a4..a224c94 100644 --- a/1.6/Dockerfile +++ b/1.6/Dockerfile @@ -29,14 +29,18 @@ RUN set -x \ \ && makeOpts=' \ TARGET=linux2628 \ - USE_LUA=1 LUA_INC=/usr/include/lua5.3 \ USE_GETADDRINFO=1 \ + USE_LUA=1 LUA_INC=/usr/include/lua5.3 \ USE_OPENSSL=1 \ USE_PCRE2=1 USE_PCRE2_JIT=1 \ USE_ZLIB=1 \ + \ + EXTRA_OBJS=" \ + " \ ' \ - && make -C /usr/src/haproxy -j "$(nproc)" all $makeOpts \ - && make -C /usr/src/haproxy install-bin $makeOpts \ + && nproc="$(nproc)" \ + && eval "make -C /usr/src/haproxy -j '$nproc' all $makeOpts" \ + && eval "make -C /usr/src/haproxy install-bin $makeOpts" \ \ && mkdir -p /usr/local/etc/haproxy \ && cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \ diff --git a/1.6/alpine/Dockerfile b/1.6/alpine/Dockerfile index 3051be9..2b60605 100644 --- a/1.6/alpine/Dockerfile +++ b/1.6/alpine/Dockerfile @@ -30,14 +30,18 @@ RUN set -x \ \ && makeOpts=' \ TARGET=linux2628 \ - USE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 \ 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 \ + \ + EXTRA_OBJS=" \ + " \ ' \ - && make -C /usr/src/haproxy -j "$(getconf _NPROCESSORS_ONLN)" all $makeOpts \ - && make -C /usr/src/haproxy install-bin $makeOpts \ + && nproc="$(getconf _NPROCESSORS_ONLN)" \ + && eval "make -C /usr/src/haproxy -j '$nproc' all $makeOpts" \ + && eval "make -C /usr/src/haproxy install-bin $makeOpts" \ \ && mkdir -p /usr/local/etc/haproxy \ && cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \ diff --git a/1.7/Dockerfile b/1.7/Dockerfile index 5b360be..81441e2 100644 --- a/1.7/Dockerfile +++ b/1.7/Dockerfile @@ -29,14 +29,18 @@ RUN set -x \ \ && makeOpts=' \ TARGET=linux2628 \ - USE_LUA=1 LUA_INC=/usr/include/lua5.3 \ USE_GETADDRINFO=1 \ + USE_LUA=1 LUA_INC=/usr/include/lua5.3 \ USE_OPENSSL=1 \ USE_PCRE2=1 USE_PCRE2_JIT=1 \ USE_ZLIB=1 \ + \ + EXTRA_OBJS=" \ + " \ ' \ - && make -C /usr/src/haproxy -j "$(nproc)" all $makeOpts \ - && make -C /usr/src/haproxy install-bin $makeOpts \ + && nproc="$(nproc)" \ + && eval "make -C /usr/src/haproxy -j '$nproc' all $makeOpts" \ + && eval "make -C /usr/src/haproxy install-bin $makeOpts" \ \ && mkdir -p /usr/local/etc/haproxy \ && cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \ diff --git a/1.7/alpine/Dockerfile b/1.7/alpine/Dockerfile index a1c44f6..4972398 100644 --- a/1.7/alpine/Dockerfile +++ b/1.7/alpine/Dockerfile @@ -30,14 +30,18 @@ RUN set -x \ \ && makeOpts=' \ TARGET=linux2628 \ - USE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 \ 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 \ + \ + EXTRA_OBJS=" \ + " \ ' \ - && make -C /usr/src/haproxy -j "$(getconf _NPROCESSORS_ONLN)" all $makeOpts \ - && make -C /usr/src/haproxy install-bin $makeOpts \ + && nproc="$(getconf _NPROCESSORS_ONLN)" \ + && eval "make -C /usr/src/haproxy -j '$nproc' all $makeOpts" \ + && eval "make -C /usr/src/haproxy install-bin $makeOpts" \ \ && mkdir -p /usr/local/etc/haproxy \ && cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \ diff --git a/1.8/Dockerfile b/1.8/Dockerfile index 1edd126..0d861bb 100644 --- a/1.8/Dockerfile +++ b/1.8/Dockerfile @@ -29,14 +29,18 @@ RUN set -x \ \ && makeOpts=' \ TARGET=linux2628 \ - USE_LUA=1 LUA_INC=/usr/include/lua5.3 \ USE_GETADDRINFO=1 \ + USE_LUA=1 LUA_INC=/usr/include/lua5.3 \ USE_OPENSSL=1 \ USE_PCRE2=1 USE_PCRE2_JIT=1 \ USE_ZLIB=1 \ + \ + EXTRA_OBJS=" \ + " \ ' \ - && make -C /usr/src/haproxy -j "$(nproc)" all $makeOpts \ - && make -C /usr/src/haproxy install-bin $makeOpts \ + && nproc="$(nproc)" \ + && eval "make -C /usr/src/haproxy -j '$nproc' all $makeOpts" \ + && eval "make -C /usr/src/haproxy install-bin $makeOpts" \ \ && mkdir -p /usr/local/etc/haproxy \ && cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \ diff --git a/1.8/alpine/Dockerfile b/1.8/alpine/Dockerfile index 43dd688..49ea550 100644 --- a/1.8/alpine/Dockerfile +++ b/1.8/alpine/Dockerfile @@ -30,14 +30,18 @@ RUN set -x \ \ && makeOpts=' \ TARGET=linux2628 \ - USE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 \ 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 \ + \ + EXTRA_OBJS=" \ + " \ ' \ - && make -C /usr/src/haproxy -j "$(getconf _NPROCESSORS_ONLN)" all $makeOpts \ - && make -C /usr/src/haproxy install-bin $makeOpts \ + && nproc="$(getconf _NPROCESSORS_ONLN)" \ + && eval "make -C /usr/src/haproxy -j '$nproc' all $makeOpts" \ + && eval "make -C /usr/src/haproxy install-bin $makeOpts" \ \ && mkdir -p /usr/local/etc/haproxy \ && cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \ diff --git a/1.9/Dockerfile b/1.9/Dockerfile index fc88626..36e6048 100644 --- a/1.9/Dockerfile +++ b/1.9/Dockerfile @@ -29,14 +29,18 @@ RUN set -x \ \ && makeOpts=' \ TARGET=linux2628 \ - USE_LUA=1 LUA_INC=/usr/include/lua5.3 \ USE_GETADDRINFO=1 \ + USE_LUA=1 LUA_INC=/usr/include/lua5.3 \ USE_OPENSSL=1 \ USE_PCRE2=1 USE_PCRE2_JIT=1 \ USE_ZLIB=1 \ + \ + EXTRA_OBJS=" \ + " \ ' \ - && make -C /usr/src/haproxy -j "$(nproc)" all $makeOpts \ - && make -C /usr/src/haproxy install-bin $makeOpts \ + && nproc="$(nproc)" \ + && eval "make -C /usr/src/haproxy -j '$nproc' all $makeOpts" \ + && eval "make -C /usr/src/haproxy install-bin $makeOpts" \ \ && mkdir -p /usr/local/etc/haproxy \ && cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \ diff --git a/1.9/alpine/Dockerfile b/1.9/alpine/Dockerfile index ef2fb75..55bbbad 100644 --- a/1.9/alpine/Dockerfile +++ b/1.9/alpine/Dockerfile @@ -30,14 +30,18 @@ RUN set -x \ \ && makeOpts=' \ TARGET=linux2628 \ - USE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 \ 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 \ + \ + EXTRA_OBJS=" \ + " \ ' \ - && make -C /usr/src/haproxy -j "$(getconf _NPROCESSORS_ONLN)" all $makeOpts \ - && make -C /usr/src/haproxy install-bin $makeOpts \ + && nproc="$(getconf _NPROCESSORS_ONLN)" \ + && eval "make -C /usr/src/haproxy -j '$nproc' all $makeOpts" \ + && eval "make -C /usr/src/haproxy install-bin $makeOpts" \ \ && mkdir -p /usr/local/etc/haproxy \ && cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \ diff --git a/2.0/Dockerfile b/2.0/Dockerfile index b5277da..a132a10 100644 --- a/2.0/Dockerfile +++ b/2.0/Dockerfile @@ -29,14 +29,20 @@ RUN set -x \ \ && makeOpts=' \ TARGET=linux-glibc \ - USE_LUA=1 LUA_INC=/usr/include/lua5.3 \ USE_GETADDRINFO=1 \ + USE_LUA=1 LUA_INC=/usr/include/lua5.3 \ USE_OPENSSL=1 \ USE_PCRE2=1 USE_PCRE2_JIT=1 \ USE_ZLIB=1 \ + \ + EXTRA_OBJS=" \ +# see https://github.com/docker-library/haproxy/issues/94#issuecomment-505673353 for more details about prometheus support + contrib/prometheus-exporter/service-prometheus.o \ + " \ ' \ - && make -C /usr/src/haproxy -j "$(nproc)" all $makeOpts \ - && make -C /usr/src/haproxy install-bin $makeOpts \ + && nproc="$(nproc)" \ + && eval "make -C /usr/src/haproxy -j '$nproc' all $makeOpts" \ + && eval "make -C /usr/src/haproxy install-bin $makeOpts" \ \ && mkdir -p /usr/local/etc/haproxy \ && cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \ diff --git a/2.0/alpine/Dockerfile b/2.0/alpine/Dockerfile index acd0551..b593d8e 100644 --- a/2.0/alpine/Dockerfile +++ b/2.0/alpine/Dockerfile @@ -30,14 +30,20 @@ RUN set -x \ \ && makeOpts=' \ TARGET=linux-glibc \ - USE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 \ 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 \ + \ + EXTRA_OBJS=" \ +# see https://github.com/docker-library/haproxy/issues/94#issuecomment-505673353 for more details about prometheus support + contrib/prometheus-exporter/service-prometheus.o \ + " \ ' \ - && make -C /usr/src/haproxy -j "$(getconf _NPROCESSORS_ONLN)" all $makeOpts \ - && make -C /usr/src/haproxy install-bin $makeOpts \ + && nproc="$(getconf _NPROCESSORS_ONLN)" \ + && eval "make -C /usr/src/haproxy -j '$nproc' all $makeOpts" \ + && eval "make -C /usr/src/haproxy install-bin $makeOpts" \ \ && mkdir -p /usr/local/etc/haproxy \ && cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index a4dda53..27ef541 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -30,14 +30,20 @@ RUN set -x \ \ && makeOpts=' \ TARGET=linux-glibc \ - USE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 \ 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 \ + \ + EXTRA_OBJS=" \ +# see https://github.com/docker-library/haproxy/issues/94#issuecomment-505673353 for more details about prometheus support + contrib/prometheus-exporter/service-prometheus.o \ + " \ ' \ - && make -C /usr/src/haproxy -j "$(getconf _NPROCESSORS_ONLN)" all $makeOpts \ - && make -C /usr/src/haproxy install-bin $makeOpts \ + && nproc="$(getconf _NPROCESSORS_ONLN)" \ + && eval "make -C /usr/src/haproxy -j '$nproc' all $makeOpts" \ + && eval "make -C /usr/src/haproxy install-bin $makeOpts" \ \ && mkdir -p /usr/local/etc/haproxy \ && cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index c72e580..44c6a06 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -29,14 +29,20 @@ RUN set -x \ \ && makeOpts=' \ TARGET=linux-glibc \ - USE_LUA=1 LUA_INC=/usr/include/lua5.3 \ USE_GETADDRINFO=1 \ + USE_LUA=1 LUA_INC=/usr/include/lua5.3 \ USE_OPENSSL=1 \ USE_PCRE2=1 USE_PCRE2_JIT=1 \ USE_ZLIB=1 \ + \ + EXTRA_OBJS=" \ +# see https://github.com/docker-library/haproxy/issues/94#issuecomment-505673353 for more details about prometheus support + contrib/prometheus-exporter/service-prometheus.o \ + " \ ' \ - && make -C /usr/src/haproxy -j "$(nproc)" all $makeOpts \ - && make -C /usr/src/haproxy install-bin $makeOpts \ + && nproc="$(nproc)" \ + && eval "make -C /usr/src/haproxy -j '$nproc' all $makeOpts" \ + && eval "make -C /usr/src/haproxy install-bin $makeOpts" \ \ && mkdir -p /usr/local/etc/haproxy \ && cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \ diff --git a/update.sh b/update.sh index 9c8c194..655508d 100755 --- a/update.sh +++ b/update.sh @@ -75,6 +75,7 @@ for version in "${versions[@]}"; do if [[ "$version" = 1.* ]]; then sedExpr+=' s/linux-glibc/linux2628/; + /prometheus/d; ' fi sed -r "$sedExpr" 'Dockerfile-debian.template' > "$version/Dockerfile"