From efd86caa8356759e9462325302e949c83d82a820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Fri, 6 Nov 2020 09:25:43 +0100 Subject: [PATCH] Add HAProxy 2.3 / 2.4-dev --- {2.3-rc => 2.3}/Dockerfile | 6 +- {2.3-rc => 2.3}/alpine/Dockerfile | 6 +- {2.3-rc => 2.3}/alpine/docker-entrypoint.sh | 0 {2.3-rc => 2.3}/docker-entrypoint.sh | 0 2.4-rc/Dockerfile | 78 +++++++++++++++++++++ 2.4-rc/alpine/Dockerfile | 68 ++++++++++++++++++ 2.4-rc/alpine/docker-entrypoint.sh | 17 +++++ 2.4-rc/docker-entrypoint.sh | 17 +++++ generate-stackbrew-library.sh | 3 +- 9 files changed, 188 insertions(+), 7 deletions(-) rename {2.3-rc => 2.3}/Dockerfile (92%) rename {2.3-rc => 2.3}/alpine/Dockerfile (91%) rename {2.3-rc => 2.3}/alpine/docker-entrypoint.sh (100%) rename {2.3-rc => 2.3}/docker-entrypoint.sh (100%) create mode 100644 2.4-rc/Dockerfile create mode 100644 2.4-rc/alpine/Dockerfile create mode 100755 2.4-rc/alpine/docker-entrypoint.sh create mode 100755 2.4-rc/docker-entrypoint.sh diff --git a/2.3-rc/Dockerfile b/2.3/Dockerfile similarity index 92% rename from 2.3-rc/Dockerfile rename to 2.3/Dockerfile index 0a00cfa..1583b4c 100644 --- a/2.3-rc/Dockerfile +++ b/2.3/Dockerfile @@ -1,9 +1,9 @@ # vim:set ft=dockerfile: FROM debian:buster-slim -ENV HAPROXY_VERSION 2.3-dev9 -ENV HAPROXY_URL https://www.haproxy.org/download/2.3/src/devel/haproxy-2.3-dev9.tar.gz -ENV HAPROXY_SHA256 7c5e246dd7cf4bb7b93db36e9ae0b420b6db12725c0264604335659fe5f1e425 +ENV HAPROXY_VERSION 2.3.0 +ENV HAPROXY_URL https://www.haproxy.org/download/2.3/src/haproxy-2.3.0.tar.gz +ENV HAPROXY_SHA256 08badc59e037883f788f2c8f3358fa3e351aeaee826fd8a719f1e6252aff78fc # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments RUN set -eux; \ diff --git a/2.3-rc/alpine/Dockerfile b/2.3/alpine/Dockerfile similarity index 91% rename from 2.3-rc/alpine/Dockerfile rename to 2.3/alpine/Dockerfile index 2a4f8ad..d7ddff1 100644 --- a/2.3-rc/alpine/Dockerfile +++ b/2.3/alpine/Dockerfile @@ -1,9 +1,9 @@ # vim:set ft=dockerfile: FROM alpine:3.12 -ENV HAPROXY_VERSION 2.3-dev9 -ENV HAPROXY_URL https://www.haproxy.org/download/2.3/src/devel/haproxy-2.3-dev9.tar.gz -ENV HAPROXY_SHA256 7c5e246dd7cf4bb7b93db36e9ae0b420b6db12725c0264604335659fe5f1e425 +ENV HAPROXY_VERSION 2.3.0 +ENV HAPROXY_URL https://www.haproxy.org/download/2.3/src/haproxy-2.3.0.tar.gz +ENV HAPROXY_SHA256 08badc59e037883f788f2c8f3358fa3e351aeaee826fd8a719f1e6252aff78fc # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments RUN set -x \ diff --git a/2.3-rc/alpine/docker-entrypoint.sh b/2.3/alpine/docker-entrypoint.sh similarity index 100% rename from 2.3-rc/alpine/docker-entrypoint.sh rename to 2.3/alpine/docker-entrypoint.sh diff --git a/2.3-rc/docker-entrypoint.sh b/2.3/docker-entrypoint.sh similarity index 100% rename from 2.3-rc/docker-entrypoint.sh rename to 2.3/docker-entrypoint.sh diff --git a/2.4-rc/Dockerfile b/2.4-rc/Dockerfile new file mode 100644 index 0000000..a7c429c --- /dev/null +++ b/2.4-rc/Dockerfile @@ -0,0 +1,78 @@ +# vim:set ft=dockerfile: +FROM debian:buster-slim + +ENV HAPROXY_VERSION 2.4-dev0 +ENV HAPROXY_URL https://www.haproxy.org/download/2.4/src/devel/haproxy-2.4-dev0.tar.gz +ENV HAPROXY_SHA256 0a473edd729a8003125e59cd682e5a0c7a6b1e8f69213da71e85e305fb1593f9 + +# 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 / +ENTRYPOINT ["/docker-entrypoint.sh"] +CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"] diff --git a/2.4-rc/alpine/Dockerfile b/2.4-rc/alpine/Dockerfile new file mode 100644 index 0000000..db61a22 --- /dev/null +++ b/2.4-rc/alpine/Dockerfile @@ -0,0 +1,68 @@ +# vim:set ft=dockerfile: +FROM alpine:3.12 + +ENV HAPROXY_VERSION 2.4-dev0 +ENV HAPROXY_URL https://www.haproxy.org/download/2.4/src/devel/haproxy-2.4-dev0.tar.gz +ENV HAPROXY_SHA256 0a473edd729a8003125e59cd682e5a0c7a6b1e8f69213da71e85e305fb1593f9 + +# 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 / +ENTRYPOINT ["/docker-entrypoint.sh"] +CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"] diff --git a/2.4-rc/alpine/docker-entrypoint.sh b/2.4-rc/alpine/docker-entrypoint.sh new file mode 100755 index 0000000..8b2093b --- /dev/null +++ b/2.4-rc/alpine/docker-entrypoint.sh @@ -0,0 +1,17 @@ +#!/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.4-rc/docker-entrypoint.sh b/2.4-rc/docker-entrypoint.sh new file mode 100755 index 0000000..8b2093b --- /dev/null +++ b/2.4-rc/docker-entrypoint.sh @@ -0,0 +1,17 @@ +#!/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/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 259dffd..2d4f646 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -3,7 +3,8 @@ set -Eeuo pipefail # https://www.haproxy.org/#down ("LTS" vs "latest") declare -A aliases=( - [2.2]='latest lts' + [2.2]='lts' + [2.3]='latest' ) self="$(basename "$BASH_SOURCE")"