diff --git a/2.1/Dockerfile b/2.1/Dockerfile deleted file mode 100644 index b3d0d9a4..00000000 --- a/2.1/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# vim:set ft=dockerfile: -FROM debian:buster-slim - -# roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6 -RUN set -eux; \ - groupadd --gid 99 --system haproxy; \ - useradd \ - --gid haproxy \ - --home-dir /var/lib/haproxy \ - --no-create-home \ - --system \ - --uid 99 \ - haproxy - -ENV HAPROXY_VERSION 2.1.12 -ENV HAPROXY_URL https://www.haproxy.org/download/2.1/src/haproxy-2.1.12.tar.gz -ENV HAPROXY_SHA256 acebbf932f2703ee287d6e945bd845cde8c9db9a13f7cbb2a99671499c558056 - -# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates \ - gcc \ - libc6-dev \ - liblua5.3-dev \ - libpcre2-dev \ - libssl-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=linux-glibc \ - 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 \ - " \ - '; \ -# https://salsa.debian.org/haproxy-team/haproxy/-/commit/53988af3d006ebcbf2c941e34121859fd6379c70 - dpkgArch="$(dpkg --print-architecture)"; \ - case "$dpkgArch" in \ - armel) makeOpts="$makeOpts ADDLIB=-latomic" ;; \ - esac; \ - \ - 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 /usr/local/bin/ -RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"] diff --git a/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile deleted file mode 100644 index 03a63a36..00000000 --- a/2.1/alpine/Dockerfile +++ /dev/null @@ -1,82 +0,0 @@ -# vim:set ft=dockerfile: -FROM alpine:3.13 - -# roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable -RUN set -eux; \ - addgroup --gid 99 --system haproxy; \ - adduser \ - --disabled-password \ - --home /var/lib/haproxy \ - --ingroup haproxy \ - --no-create-home \ - --system \ - --uid 99 \ - haproxy - -ENV HAPROXY_VERSION 2.1.12 -ENV HAPROXY_URL https://www.haproxy.org/download/2.1/src/haproxy-2.1.12.tar.gz -ENV HAPROXY_SHA256 acebbf932f2703ee287d6e945bd845cde8c9db9a13f7cbb2a99671499c558056 - -# 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 \ - gcc \ - libc-dev \ - linux-headers \ - lua5.3-dev \ - 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=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 \ - \ - 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 \ - " \ - ' \ - && 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 /usr/local/bin/ -RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"] diff --git a/2.1/alpine/docker-entrypoint.sh b/2.1/alpine/docker-entrypoint.sh deleted file mode 100755 index 8b2093b0..00000000 --- a/2.1/alpine/docker-entrypoint.sh +++ /dev/null @@ -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 - # -W -- "master-worker mode" (similar to the old "haproxy-systemd-wrapper"; allows for reload via "SIGUSR2") - # -db -- disables background mode - set -- haproxy -W -db "$@" -fi - -exec "$@" diff --git a/2.1/docker-entrypoint.sh b/2.1/docker-entrypoint.sh deleted file mode 100755 index 8b2093b0..00000000 --- a/2.1/docker-entrypoint.sh +++ /dev/null @@ -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 - # -W -- "master-worker mode" (similar to the old "haproxy-systemd-wrapper"; allows for reload via "SIGUSR2") - # -db -- disables background mode - set -- haproxy -W -db "$@" -fi - -exec "$@" diff --git a/update.sh b/update.sh index 40d0fb2e..037517a9 100755 --- a/update.sh +++ b/update.sh @@ -73,7 +73,7 @@ for version in "${versions[@]}"; do ' fi case "$version" in - 1.* | 2.0 | 2.1 | 2.2 | 2.3) + 1.* | 2.0 | 2.2 | 2.3) # backwards compatibility (to try to avoid breaking existing users) sedExpr+=' /^USER /d