From 0194df549ecef362ff27d0f06601ea784183428f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Tue, 31 May 2022 17:56:27 +0200 Subject: [PATCH] Add HAProxy 2.6 / 2.7-rc --- {2.6-rc => 2.6}/Dockerfile | 6 +- {2.6-rc => 2.6}/alpine/Dockerfile | 6 +- {2.6-rc => 2.6}/alpine/docker-entrypoint.sh | 0 {2.6-rc => 2.6}/docker-entrypoint.sh | 0 2.7-rc/Dockerfile | 99 +++++++++++++++++++++ 2.7-rc/alpine/Dockerfile | 92 +++++++++++++++++++ 2.7-rc/alpine/docker-entrypoint.sh | 17 ++++ 2.7-rc/docker-entrypoint.sh | 17 ++++ generate-stackbrew-library.sh | 5 +- versions.json | 15 +++- 10 files changed, 244 insertions(+), 13 deletions(-) rename {2.6-rc => 2.6}/Dockerfile (93%) rename {2.6-rc => 2.6}/alpine/Dockerfile (92%) rename {2.6-rc => 2.6}/alpine/docker-entrypoint.sh (100%) rename {2.6-rc => 2.6}/docker-entrypoint.sh (100%) create mode 100644 2.7-rc/Dockerfile create mode 100644 2.7-rc/alpine/Dockerfile create mode 100755 2.7-rc/alpine/docker-entrypoint.sh create mode 100755 2.7-rc/docker-entrypoint.sh diff --git a/2.6-rc/Dockerfile b/2.6/Dockerfile similarity index 93% rename from 2.6-rc/Dockerfile rename to 2.6/Dockerfile index 9cf42013..935df299 100644 --- a/2.6-rc/Dockerfile +++ b/2.6/Dockerfile @@ -20,9 +20,9 @@ RUN set -eux; \ mkdir /var/lib/haproxy; \ chown haproxy:haproxy /var/lib/haproxy -ENV HAPROXY_VERSION 2.6-dev12 -ENV HAPROXY_URL https://www.haproxy.org/download/2.6/src/devel/haproxy-2.6-dev12.tar.gz -ENV HAPROXY_SHA256 df21bb71333abb8ef75eadcf40ca4ded948c2f404b7b1af49fc6365ca191ca0a +ENV HAPROXY_VERSION 2.6.0 +ENV HAPROXY_URL https://www.haproxy.org/download/2.6/src/haproxy-2.6.0.tar.gz +ENV HAPROXY_SHA256 90f8e608aacd513b0f542e0438fa12e7fb4622cf58bd4375f3fe0350146eaa59 # 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.6-rc/alpine/Dockerfile b/2.6/alpine/Dockerfile similarity index 92% rename from 2.6-rc/alpine/Dockerfile rename to 2.6/alpine/Dockerfile index a9f2715c..cf5a4bf7 100644 --- a/2.6-rc/alpine/Dockerfile +++ b/2.6/alpine/Dockerfile @@ -21,9 +21,9 @@ RUN set -eux; \ mkdir /var/lib/haproxy; \ chown haproxy:haproxy /var/lib/haproxy -ENV HAPROXY_VERSION 2.6-dev12 -ENV HAPROXY_URL https://www.haproxy.org/download/2.6/src/devel/haproxy-2.6-dev12.tar.gz -ENV HAPROXY_SHA256 df21bb71333abb8ef75eadcf40ca4ded948c2f404b7b1af49fc6365ca191ca0a +ENV HAPROXY_VERSION 2.6.0 +ENV HAPROXY_URL https://www.haproxy.org/download/2.6/src/haproxy-2.6.0.tar.gz +ENV HAPROXY_SHA256 90f8e608aacd513b0f542e0438fa12e7fb4622cf58bd4375f3fe0350146eaa59 # 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.6-rc/alpine/docker-entrypoint.sh b/2.6/alpine/docker-entrypoint.sh similarity index 100% rename from 2.6-rc/alpine/docker-entrypoint.sh rename to 2.6/alpine/docker-entrypoint.sh diff --git a/2.6-rc/docker-entrypoint.sh b/2.6/docker-entrypoint.sh similarity index 100% rename from 2.6-rc/docker-entrypoint.sh rename to 2.6/docker-entrypoint.sh diff --git a/2.7-rc/Dockerfile b/2.7-rc/Dockerfile new file mode 100644 index 00000000..1466cd90 --- /dev/null +++ b/2.7-rc/Dockerfile @@ -0,0 +1,99 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM debian:bullseye-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 \ + ; \ + mkdir /var/lib/haproxy; \ + chown haproxy:haproxy /var/lib/haproxy + +ENV HAPROXY_VERSION 2.7-dev0 +ENV HAPROXY_URL https://www.haproxy.org/download/2.7/src/devel/haproxy-2.7-dev0.tar.gz +ENV HAPROXY_SHA256 75cfe3f3884cae05f93f0a91114b953de7aebba574c026e9d9106988fed34080 + +# 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 \ + ; \ + 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_PROMEX=1 \ + \ + EXTRA_OBJS=" \ + " \ + '; \ +# 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; \ + \ +# smoke test + haproxy -v + +# 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/ +ENTRYPOINT ["docker-entrypoint.sh"] + +USER haproxy +CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"] diff --git a/2.7-rc/alpine/Dockerfile b/2.7-rc/alpine/Dockerfile new file mode 100644 index 00000000..ae2ca637 --- /dev/null +++ b/2.7-rc/alpine/Dockerfile @@ -0,0 +1,92 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.16 + +# 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 \ + ; \ + mkdir /var/lib/haproxy; \ + chown haproxy:haproxy /var/lib/haproxy + +ENV HAPROXY_VERSION 2.7-dev0 +ENV HAPROXY_URL https://www.haproxy.org/download/2.7/src/devel/haproxy-2.7-dev0.tar.gz +ENV HAPROXY_SHA256 75cfe3f3884cae05f93f0a91114b953de7aebba574c026e9d9106988fed34080 + +# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments +RUN set -eux; \ + \ + apk add --no-cache --virtual .build-deps \ + gcc \ + libc-dev \ + linux-headers \ + lua5.3-dev \ + make \ + openssl \ + openssl-dev \ + pcre2-dev \ + readline-dev \ + tar \ + ; \ + \ + 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_PROMEX=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; \ + \ +# smoke test + haproxy -v + +# 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/ +ENTRYPOINT ["docker-entrypoint.sh"] + +USER haproxy +CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"] diff --git a/2.7-rc/alpine/docker-entrypoint.sh b/2.7-rc/alpine/docker-entrypoint.sh new file mode 100755 index 00000000..8b2093b0 --- /dev/null +++ b/2.7-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.7-rc/docker-entrypoint.sh b/2.7-rc/docker-entrypoint.sh new file mode 100755 index 00000000..8b2093b0 --- /dev/null +++ b/2.7-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 b1d03740..c6544818 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -1,10 +1,9 @@ #!/usr/bin/env bash set -Eeuo pipefail -# https://www.haproxy.org/#down ("LTS" vs "latest") +# https://www.haproxy.org/#last ("LTS" vs "latest") declare -A aliases=( - [2.5]='latest' - [2.4]='lts' + [2.6]='lts latest' ) self="$(basename "$BASH_SOURCE")" diff --git a/versions.json b/versions.json index 12e9d725..48dce6ed 100644 --- a/versions.json +++ b/versions.json @@ -41,11 +41,18 @@ "url": "https://www.haproxy.org/download/2.5/src/haproxy-2.5.7.tar.gz", "version": "2.5.7" }, - "2.6-rc": { + "2.6": { "alpine": "3.16", "debian": "bullseye-slim", - "sha256": "df21bb71333abb8ef75eadcf40ca4ded948c2f404b7b1af49fc6365ca191ca0a", - "url": "https://www.haproxy.org/download/2.6/src/devel/haproxy-2.6-dev12.tar.gz", - "version": "2.6-dev12" + "sha256": "90f8e608aacd513b0f542e0438fa12e7fb4622cf58bd4375f3fe0350146eaa59", + "url": "https://www.haproxy.org/download/2.6/src/haproxy-2.6.0.tar.gz", + "version": "2.6.0" + }, + "2.7-rc": { + "alpine": "3.16", + "debian": "bullseye-slim", + "sha256": "75cfe3f3884cae05f93f0a91114b953de7aebba574c026e9d9106988fed34080", + "url": "https://www.haproxy.org/download/2.7/src/devel/haproxy-2.7-dev0.tar.gz", + "version": "2.7-dev0" } }