From b3a4c115024e1982ce9bc262038e685941008313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Thu, 11 Jan 2018 17:38:37 +0100 Subject: [PATCH] Remove haproxy 1.4 While still not officially unmaintained Willy asked on haproxy's mailing list whether anyone still uses haproxy 1.4 or whether he should set it to unmaintained: https://www.mail-archive.com/haproxy@formilux.org/msg28512.html No one responded that they did. Further reasons for removal: - haproxy 1.4 does not even support TLS - and haproxy 1.5 is only one year younger than Docker itself which makes it unlikely anyone is running haproxy 1.4 inside of Docker. --- .travis.yml | 3 --- 1.4/Dockerfile | 32 ----------------------- 1.4/alpine/Dockerfile | 45 --------------------------------- 1.4/alpine/docker-entrypoint.sh | 16 ------------ 1.4/docker-entrypoint.sh | 16 ------------ 5 files changed, 112 deletions(-) delete mode 100644 1.4/Dockerfile delete mode 100644 1.4/alpine/Dockerfile delete mode 100755 1.4/alpine/docker-entrypoint.sh delete mode 100755 1.4/docker-entrypoint.sh diff --git a/.travis.yml b/.travis.yml index 71affe3a..07dcb5fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,9 +14,6 @@ env: - VERSION=1.5 VARIANT= - VERSION=1.5 ARCH=i386 - VERSION=1.5 VARIANT=alpine - - VERSION=1.4 VARIANT= - - VERSION=1.4 ARCH=i386 - - VERSION=1.4 VARIANT=alpine install: - git clone https://github.com/docker-library/official-images.git ~/official-images diff --git a/1.4/Dockerfile b/1.4/Dockerfile deleted file mode 100644 index 5bbd596d..00000000 --- a/1.4/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -FROM debian:jessie - -RUN apt-get update && apt-get install -y libpcre3 --no-install-recommends && rm -rf /var/lib/apt/lists/* - -ENV HAPROXY_MAJOR 1.4 -ENV HAPROXY_VERSION 1.4.27 -ENV HAPROXY_MD5 459b82968791472427326ea009834c66 - -# see http://sources.debian.net/src/haproxy/1.5.8-1/debian/rules/ for some helpful navigation of the possible "make" arguments -RUN buildDeps='curl gcc libc6-dev libpcre3-dev libssl-dev make' \ - && set -x \ - && apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \ - && curl -SL "http://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" -o haproxy.tar.gz \ - && echo "${HAPROXY_MD5} haproxy.tar.gz" | md5sum -c \ - && mkdir -p /usr/src/haproxy \ - && tar -xzf haproxy.tar.gz -C /usr/src/haproxy --strip-components=1 \ - && rm haproxy.tar.gz \ - && make -C /usr/src/haproxy \ - TARGET=linux2628 \ - USE_PCRE=1 PCREDIR= \ - USE_OPENSSL=1 \ - USE_ZLIB=1 \ - all \ - install-bin \ - && mkdir -p /usr/local/etc/haproxy \ - && cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \ - && rm -rf /usr/src/haproxy \ - && apt-get purge -y --auto-remove $buildDeps - -COPY docker-entrypoint.sh / -ENTRYPOINT ["/docker-entrypoint.sh"] -CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"] diff --git a/1.4/alpine/Dockerfile b/1.4/alpine/Dockerfile deleted file mode 100644 index 09cdc14c..00000000 --- a/1.4/alpine/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM alpine:3.5 - -ENV HAPROXY_MAJOR 1.4 -ENV HAPROXY_VERSION 1.4.27 -ENV HAPROXY_MD5 459b82968791472427326ea009834c66 - -# see http://sources.debian.net/src/haproxy/1.5.8-1/debian/rules/ for some helpful navigation of the possible "make" arguments -RUN set -x \ - && apk add --no-cache --virtual .build-deps \ - curl \ - gcc \ - libc-dev \ - linux-headers \ - make \ - openssl-dev \ - pcre-dev \ - zlib-dev \ - && curl -SL "http://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" -o haproxy.tar.gz \ - && echo "${HAPROXY_MD5} haproxy.tar.gz" | md5sum -c \ - && mkdir -p /usr/src \ - && tar -xzf haproxy.tar.gz -C /usr/src \ - && mv "/usr/src/haproxy-$HAPROXY_VERSION" /usr/src/haproxy \ - && rm haproxy.tar.gz \ - && make -C /usr/src/haproxy \ - TARGET=linux2628 \ - USE_PCRE=1 PCREDIR= \ - USE_OPENSSL=1 \ - USE_ZLIB=1 \ - all \ - install-bin \ - && 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 --virtual .haproxy-rundeps $runDeps \ - && apk del .build-deps - -COPY docker-entrypoint.sh / -ENTRYPOINT ["/docker-entrypoint.sh"] -CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"] diff --git a/1.4/alpine/docker-entrypoint.sh b/1.4/alpine/docker-entrypoint.sh deleted file mode 100755 index 34174c60..00000000 --- a/1.4/alpine/docker-entrypoint.sh +++ /dev/null @@ -1,16 +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 - # -db -- disables background mode - set -- haproxy -db "$@" -fi - -exec "$@" diff --git a/1.4/docker-entrypoint.sh b/1.4/docker-entrypoint.sh deleted file mode 100755 index 34174c60..00000000 --- a/1.4/docker-entrypoint.sh +++ /dev/null @@ -1,16 +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 - # -db -- disables background mode - set -- haproxy -db "$@" -fi - -exec "$@"