From 609bd629b73b3a37202308451a4aa71740984144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Sun, 16 Jun 2019 23:56:26 +0200 Subject: [PATCH] Add haproxy 2.0 --- .travis.yml | 6 +++--- {2.0-rc => 2.0}/Dockerfile | 8 ++++---- {2.0-rc => 2.0}/alpine/Dockerfile | 8 ++++---- {2.0-rc => 2.0}/alpine/docker-entrypoint.sh | 0 {2.0-rc => 2.0}/docker-entrypoint.sh | 0 Dockerfile-alpine.template | 2 +- Dockerfile-debian.template | 2 +- update.sh | 5 +++++ 8 files changed, 18 insertions(+), 13 deletions(-) rename {2.0-rc => 2.0}/Dockerfile (89%) rename {2.0-rc => 2.0}/alpine/Dockerfile (89%) rename {2.0-rc => 2.0}/alpine/docker-entrypoint.sh (100%) rename {2.0-rc => 2.0}/docker-entrypoint.sh (100%) diff --git a/.travis.yml b/.travis.yml index b70e557..ee5a38e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,9 @@ language: bash services: docker env: - - VERSION=2.0-rc VARIANT= - - VERSION=2.0-rc ARCH=i386 - - VERSION=2.0-rc VARIANT=alpine + - VERSION=2.0 VARIANT= + - VERSION=2.0 ARCH=i386 + - VERSION=2.0 VARIANT=alpine - VERSION=1.9 VARIANT= - VERSION=1.9 ARCH=i386 - VERSION=1.9 VARIANT=alpine diff --git a/2.0-rc/Dockerfile b/2.0/Dockerfile similarity index 89% rename from 2.0-rc/Dockerfile rename to 2.0/Dockerfile index 06e92a2..7de81b3 100644 --- a/2.0-rc/Dockerfile +++ b/2.0/Dockerfile @@ -1,9 +1,9 @@ # vim:set ft=dockerfile: FROM debian:stretch-slim -ENV HAPROXY_VERSION 2.0-dev7 -ENV HAPROXY_URL https://www.haproxy.org/download/2.0/src/devel/haproxy-2.0-dev7.tar.gz -ENV HAPROXY_SHA256 24ee21e9cb18347d42b46398edd883d3a517cfc4e59a33de28bb8112fedf78c3 +ENV HAPROXY_VERSION 2.0.0 +ENV HAPROXY_URL https://www.haproxy.org/download/2.0/src/haproxy-2.0.0.tar.gz +ENV HAPROXY_SHA256 fe0a0d69e1091066a91b8d39199c19af8748e0e872961c6fc43c91ec7a28ff20 # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments RUN set -x \ @@ -28,7 +28,7 @@ RUN set -x \ && rm haproxy.tar.gz \ \ && makeOpts=' \ - TARGET=linux2628 \ + TARGET=linux-glibc \ USE_LUA=1 LUA_INC=/usr/include/lua5.3 \ USE_GETADDRINFO=1 \ USE_OPENSSL=1 \ diff --git a/2.0-rc/alpine/Dockerfile b/2.0/alpine/Dockerfile similarity index 89% rename from 2.0-rc/alpine/Dockerfile rename to 2.0/alpine/Dockerfile index 4ec4b58..95cb91b 100644 --- a/2.0-rc/alpine/Dockerfile +++ b/2.0/alpine/Dockerfile @@ -1,9 +1,9 @@ # vim:set ft=dockerfile: FROM alpine:3.9 -ENV HAPROXY_VERSION 2.0-dev7 -ENV HAPROXY_URL https://www.haproxy.org/download/2.0/src/devel/haproxy-2.0-dev7.tar.gz -ENV HAPROXY_SHA256 24ee21e9cb18347d42b46398edd883d3a517cfc4e59a33de28bb8112fedf78c3 +ENV HAPROXY_VERSION 2.0.0 +ENV HAPROXY_URL https://www.haproxy.org/download/2.0/src/haproxy-2.0.0.tar.gz +ENV HAPROXY_SHA256 fe0a0d69e1091066a91b8d39199c19af8748e0e872961c6fc43c91ec7a28ff20 # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments RUN set -x \ @@ -29,7 +29,7 @@ RUN set -x \ && rm haproxy.tar.gz \ \ && makeOpts=' \ - TARGET=linux2628 \ + TARGET=linux-glibc \ USE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 \ USE_GETADDRINFO=1 \ USE_OPENSSL=1 \ diff --git a/2.0-rc/alpine/docker-entrypoint.sh b/2.0/alpine/docker-entrypoint.sh similarity index 100% rename from 2.0-rc/alpine/docker-entrypoint.sh rename to 2.0/alpine/docker-entrypoint.sh diff --git a/2.0-rc/docker-entrypoint.sh b/2.0/docker-entrypoint.sh similarity index 100% rename from 2.0-rc/docker-entrypoint.sh rename to 2.0/docker-entrypoint.sh diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 1f6465d..8b578f6 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -29,7 +29,7 @@ RUN set -x \ && rm haproxy.tar.gz \ \ && makeOpts=' \ - TARGET=linux2628 \ + TARGET=linux-glibc \ USE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 \ USE_GETADDRINFO=1 \ USE_OPENSSL=1 \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 72024ce..86d0930 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -28,7 +28,7 @@ RUN set -x \ && rm haproxy.tar.gz \ \ && makeOpts=' \ - TARGET=linux2628 \ + TARGET=linux-glibc \ USE_LUA=1 LUA_INC=/usr/include/lua5.3 \ USE_GETADDRINFO=1 \ USE_OPENSSL=1 \ diff --git a/update.sh b/update.sh index f52c5d9..978bed3 100755 --- a/update.sh +++ b/update.sh @@ -72,6 +72,11 @@ for version in "${versions[@]}"; do s/libssl-dev/libssl1.0-dev/; ' fi + if [[ "$version" = 1.* ]]; then + sedExpr+=' + s/linux-glibc/linux2628/; + ' + fi sed -r "$sedExpr" 'Dockerfile-debian.template' > "$version/Dockerfile" for variant in alpine; do