Merge pull request #89 from TimWolla/2.0

Add haproxy 2.0
This commit is contained in:
Tianon Gravi authored and GitHub committed 2019-06-17 07:43:06 -07:00
commit 0178f05292
8 files changed
+18 -13

No files matched your search

+3 -3
View File
@@ -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
+4 -4
View File
@@ -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 \
@@ -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 \
File renamed without changes.
File renamed without changes.
+1 -1
View File
@@ -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 \
+1 -1
View File
@@ -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 \
+5
View File
@@ -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