From 24c34a792e4e4cffe4e564cde0bca744c3be2d67 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 31 Jul 2020 10:32:17 -0700 Subject: [PATCH] Remove EOL 1.9 series See https://www.mail-archive.com/haproxy@formilux.org/msg38078.html --- 1.9/Dockerfile | 68 --------------------------------- 1.9/alpine/Dockerfile | 66 -------------------------------- 1.9/alpine/docker-entrypoint.sh | 17 --------- 1.9/docker-entrypoint.sh | 17 --------- 4 files changed, 168 deletions(-) delete mode 100644 1.9/Dockerfile delete mode 100644 1.9/alpine/Dockerfile delete mode 100755 1.9/alpine/docker-entrypoint.sh delete mode 100755 1.9/docker-entrypoint.sh diff --git a/1.9/Dockerfile b/1.9/Dockerfile deleted file mode 100644 index f3a6a8c..0000000 --- a/1.9/Dockerfile +++ /dev/null @@ -1,68 +0,0 @@ -# vim:set ft=dockerfile: -FROM debian:buster-slim - -ENV HAPROXY_VERSION 1.9.16 -ENV HAPROXY_URL https://www.haproxy.org/download/1.9/src/haproxy-1.9.16.tar.gz -ENV HAPROXY_SHA256 47174becf7c641c837b7338210f6194f266de45c49a38b68655fcd980f95bdbf - -# 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 \ - 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=linux2628 \ - 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=" \ - " \ - ' \ - && 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/1.9/alpine/Dockerfile b/1.9/alpine/Dockerfile deleted file mode 100644 index e23e845..0000000 --- a/1.9/alpine/Dockerfile +++ /dev/null @@ -1,66 +0,0 @@ -# vim:set ft=dockerfile: -FROM alpine:3.12 - -ENV HAPROXY_VERSION 1.9.16 -ENV HAPROXY_URL https://www.haproxy.org/download/1.9/src/haproxy-1.9.16.tar.gz -ENV HAPROXY_SHA256 47174becf7c641c837b7338210f6194f266de45c49a38b68655fcd980f95bdbf - -# 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=linux2628 \ - 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=" \ - " \ - ' \ - && 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/1.9/alpine/docker-entrypoint.sh b/1.9/alpine/docker-entrypoint.sh deleted file mode 100755 index 8b2093b..0000000 --- a/1.9/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/1.9/docker-entrypoint.sh b/1.9/docker-entrypoint.sh deleted file mode 100755 index 8b2093b..0000000 --- a/1.9/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 "$@"