mirror of
https://github.com/docker-library/haproxy.git
synced 2026-11-20 21:29:04 +03:00
Enable the inclusion of "contrib/prometheus-exporter/service-prometheus.o" on 2+
This commit is contained in:
1 parent
949a43ebdc
commit
d21ad4557d
15 files changed
+105
-40
No files matched your search
+6
-2
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
+7
-3
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
+7
-3
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
+7
-3
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
+7
-3
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
+9
-3
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
Reference in new issue
Block a user