mirror of
https://github.com/docker-library/haproxy.git
synced 2026-11-20 21:29:04 +03:00
Merge pull request #108 from TimWolla/haproxy-1.5-eol
Remove HAProxy 1.5 (EOL)
This commit is contained in:
6 files changed
+1
-176
No files matched your search
@@ -20,9 +20,6 @@ env:
|
||||
- VERSION=1.6 VARIANT=
|
||||
- VERSION=1.6 ARCH=i386
|
||||
- VERSION=1.6 VARIANT=alpine
|
||||
- VERSION=1.5 VARIANT=
|
||||
- VERSION=1.5 ARCH=i386
|
||||
- VERSION=1.5 VARIANT=alpine
|
||||
|
||||
install:
|
||||
- git clone https://github.com/docker-library/official-images.git ~/official-images
|
||||
|
||||
@@ -1,66 +0,0 @@
|
||||
# vim:set ft=dockerfile:
|
||||
FROM debian:stretch-slim
|
||||
|
||||
ENV HAPROXY_VERSION 1.5.19
|
||||
ENV HAPROXY_URL https://www.haproxy.org/download/1.5/src/haproxy-1.5.19.tar.gz
|
||||
ENV HAPROXY_SHA256 e00ae2a633da614967f2e3ebebdb817ec537cba8383b833fc8d9a506876e0d5e
|
||||
|
||||
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
|
||||
RUN set -x \
|
||||
\
|
||||
&& savedAptMark="$(apt-mark showmanual)" \
|
||||
&& apt-get update && apt-get install -y --no-install-recommends \
|
||||
ca-certificates \
|
||||
gcc \
|
||||
libc6-dev \
|
||||
libpcre2-dev \
|
||||
libssl1.0-dev \
|
||||
make \
|
||||
wget \
|
||||
zlib1g-dev \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
\
|
||||
&& wget -O haproxy.tar.gz "$HAPROXY_URL" \
|
||||
&& echo "$HAPROXY_SHA256 *haproxy.tar.gz" | sha256sum -c \
|
||||
&& mkdir -p /usr/src/haproxy \
|
||||
&& tar -xzf haproxy.tar.gz -C /usr/src/haproxy --strip-components=1 \
|
||||
&& rm haproxy.tar.gz \
|
||||
\
|
||||
&& makeOpts=' \
|
||||
TARGET=linux2628 \
|
||||
USE_GETADDRINFO=1 \
|
||||
USE_OPENSSL=1 \
|
||||
USE_PCRE2=1 USE_PCRE2_JIT=1 \
|
||||
USE_ZLIB=1 \
|
||||
\
|
||||
EXTRA_OBJS=" \
|
||||
" \
|
||||
' \
|
||||
&& 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 \
|
||||
&& rm -rf /usr/src/haproxy \
|
||||
\
|
||||
&& apt-mark auto '.*' > /dev/null \
|
||||
&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
|
||||
&& find /usr/local -type f -executable -exec ldd '{}' ';' \
|
||||
| awk '/=>/ { print $(NF-1) }' \
|
||||
| sort -u \
|
||||
| xargs -r dpkg-query --search \
|
||||
| cut -d: -f1 \
|
||||
| sort -u \
|
||||
| xargs -r apt-mark manual \
|
||||
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false
|
||||
|
||||
# https://www.haproxy.org/download/1.8/doc/management.txt
|
||||
# "4. Stopping and restarting HAProxy"
|
||||
# "when the SIGTERM signal is sent to the haproxy process, it immediately quits and all established connections are closed"
|
||||
# "graceful stop is triggered when the SIGUSR1 signal is sent to the haproxy process"
|
||||
STOPSIGNAL SIGUSR1
|
||||
|
||||
COPY docker-entrypoint.sh /
|
||||
ENTRYPOINT ["/docker-entrypoint.sh"]
|
||||
CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"]
|
||||
@@ -1,65 +0,0 @@
|
||||
# vim:set ft=dockerfile:
|
||||
FROM alpine:3.8
|
||||
|
||||
ENV HAPROXY_VERSION 1.5.19
|
||||
ENV HAPROXY_URL https://www.haproxy.org/download/1.5/src/haproxy-1.5.19.tar.gz
|
||||
ENV HAPROXY_SHA256 e00ae2a633da614967f2e3ebebdb817ec537cba8383b833fc8d9a506876e0d5e
|
||||
|
||||
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
|
||||
RUN set -x \
|
||||
\
|
||||
&& apk add --no-cache --virtual .build-deps \
|
||||
ca-certificates \
|
||||
gcc \
|
||||
libc-dev \
|
||||
linux-headers \
|
||||
make \
|
||||
openssl \
|
||||
openssl-dev \
|
||||
pcre2-dev \
|
||||
readline-dev \
|
||||
tar \
|
||||
zlib-dev \
|
||||
\
|
||||
&& wget -O haproxy.tar.gz "$HAPROXY_URL" \
|
||||
&& echo "$HAPROXY_SHA256 *haproxy.tar.gz" | sha256sum -c \
|
||||
&& mkdir -p /usr/src/haproxy \
|
||||
&& tar -xzf haproxy.tar.gz -C /usr/src/haproxy --strip-components=1 \
|
||||
&& rm haproxy.tar.gz \
|
||||
\
|
||||
&& makeOpts=' \
|
||||
TARGET=linux2628 \
|
||||
USE_GETADDRINFO=1 \
|
||||
USE_OPENSSL=1 \
|
||||
USE_PCRE2=1 USE_PCRE2_JIT=1 \
|
||||
USE_ZLIB=1 \
|
||||
\
|
||||
EXTRA_OBJS=" \
|
||||
" \
|
||||
' \
|
||||
&& 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 \
|
||||
&& rm -rf /usr/src/haproxy \
|
||||
\
|
||||
&& runDeps="$( \
|
||||
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
|
||||
| tr ',' '\n' \
|
||||
| sort -u \
|
||||
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
|
||||
)" \
|
||||
&& apk add --no-network --virtual .haproxy-rundeps $runDeps \
|
||||
&& apk del --no-network .build-deps
|
||||
|
||||
# https://www.haproxy.org/download/1.8/doc/management.txt
|
||||
# "4. Stopping and restarting HAProxy"
|
||||
# "when the SIGTERM signal is sent to the haproxy process, it immediately quits and all established connections are closed"
|
||||
# "graceful stop is triggered when the SIGUSR1 signal is sent to the haproxy process"
|
||||
STOPSIGNAL SIGUSR1
|
||||
|
||||
COPY docker-entrypoint.sh /
|
||||
ENTRYPOINT ["/docker-entrypoint.sh"]
|
||||
CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"]
|
||||
@@ -1,17 +0,0 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
# first arg is `-f` or `--some-option`
|
||||
if [ "${1#-}" != "$1" ]; then
|
||||
set -- haproxy "$@"
|
||||
fi
|
||||
|
||||
if [ "$1" = 'haproxy' ]; then
|
||||
shift # "haproxy"
|
||||
# if the user wants "haproxy", let's add a couple useful flags
|
||||
# haproxy-systemd-wrapper -- "master-worker mode" (similar to the new "-W" flag; allows for reload via "SIGUSR2")
|
||||
# -db -- disables background mode
|
||||
set -- "$(which haproxy-systemd-wrapper)" -p /run/haproxy.pid -db "$@"
|
||||
fi
|
||||
|
||||
exec "$@"
|
||||
@@ -1,17 +0,0 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
# first arg is `-f` or `--some-option`
|
||||
if [ "${1#-}" != "$1" ]; then
|
||||
set -- haproxy "$@"
|
||||
fi
|
||||
|
||||
if [ "$1" = 'haproxy' ]; then
|
||||
shift # "haproxy"
|
||||
# if the user wants "haproxy", let's add a couple useful flags
|
||||
# haproxy-systemd-wrapper -- "master-worker mode" (similar to the new "-W" flag; allows for reload via "SIGUSR2")
|
||||
# -db -- disables background mode
|
||||
set -- "$(which haproxy-systemd-wrapper)" -p /run/haproxy.pid -db "$@"
|
||||
fi
|
||||
|
||||
exec "$@"
|
||||
@@ -12,11 +12,9 @@ versions=( "${versions[@]%/}" )
|
||||
defaultDebianSuite='buster-slim'
|
||||
declare -A debianSuite=(
|
||||
[1.6]='stretch-slim'
|
||||
[1.5]='stretch-slim'
|
||||
)
|
||||
defaultAlpineVersion='3.11'
|
||||
declare -A alpineVersion=(
|
||||
[1.5]='3.8'
|
||||
[1.6]='3.8'
|
||||
)
|
||||
|
||||
@@ -60,12 +58,7 @@ for version in "${versions[@]}"; do
|
||||
s/%%HAPROXY_SHA256%%/'"$sha256"'/;
|
||||
'
|
||||
|
||||
if [ "$version" = '1.5' ]; then
|
||||
sedExpr+='
|
||||
/lua/d;
|
||||
'
|
||||
fi
|
||||
if [ "$version" = 1.5 ] || [ "$version" = 1.6 ]; then
|
||||
if [ "$version" = 1.6 ]; then
|
||||
# libssl1.1 is not supported until 1.7+
|
||||
# https://git.haproxy.org/?p=haproxy-1.7.git;a=commitdiff;h=1866d6d8f1163fe28a1e8256080909a5aa166880
|
||||
sedExpr+='
|
||||
|
||||
Reference in new issue
Block a user