Add 1.9-dev9

This commit is contained in:
Tianon Gravi committed 2018-12-03 15:57:15 -08:00
1 parent 9da2494038
commit 4a2d233b1a
17 files changed
+209 -37

No files matched your search

+3
View File
@@ -2,6 +2,9 @@ language: bash
services: docker
env:
- VERSION=1.9-rc VARIANT=
- VERSION=1.9-rc ARCH=i386
- VERSION=1.9-rc VARIANT=alpine
- VERSION=1.8 VARIANT=
- VERSION=1.8 ARCH=i386
- VERSION=1.8 VARIANT=alpine
+2 -2
View File
@@ -1,8 +1,8 @@
# vim:set ft=dockerfile:
FROM debian:stretch-slim
ENV HAPROXY_MAJOR 1.5
ENV HAPROXY_VERSION 1.5.19
ENV HAPROXY_URL https://www.haproxy.org/download/1.5/src/haproxy-1.5.19.tar.gz
ENV HAPROXY_SHA256 e00ae2a633da614967f2e3ebebdb817ec537cba8383b833fc8d9a506876e0d5e
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
@@ -20,7 +20,7 @@ RUN set -x \
zlib1g-dev \
&& rm -rf /var/lib/apt/lists/* \
\
&& wget -O haproxy.tar.gz "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" \
&& 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 \
+2 -3
View File
@@ -1,8 +1,8 @@
# vim:set ft=dockerfile:
FROM alpine:3.8
ENV HAPROXY_MAJOR 1.5
ENV HAPROXY_VERSION 1.5.19
ENV HAPROXY_URL https://www.haproxy.org/download/1.5/src/haproxy-1.5.19.tar.gz
ENV HAPROXY_SHA256 e00ae2a633da614967f2e3ebebdb817ec537cba8383b833fc8d9a506876e0d5e
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
@@ -21,8 +21,7 @@ RUN set -x \
tar \
zlib-dev \
\
# install HAProxy
&& wget -O haproxy.tar.gz "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" \
&& 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 \
+2 -2
View File
@@ -1,8 +1,8 @@
# vim:set ft=dockerfile:
FROM debian:stretch-slim
ENV HAPROXY_MAJOR 1.6
ENV HAPROXY_VERSION 1.6.14
ENV HAPROXY_URL https://www.haproxy.org/download/1.6/src/haproxy-1.6.14.tar.gz
ENV HAPROXY_SHA256 bac949838a3a497221d1a9e937d60cba32156783a216146a524ce40675b6b828
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
@@ -21,7 +21,7 @@ RUN set -x \
zlib1g-dev \
&& rm -rf /var/lib/apt/lists/* \
\
&& wget -O haproxy.tar.gz "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" \
&& 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 \
+2 -3
View File
@@ -1,8 +1,8 @@
# vim:set ft=dockerfile:
FROM alpine:3.8
ENV HAPROXY_MAJOR 1.6
ENV HAPROXY_VERSION 1.6.14
ENV HAPROXY_URL https://www.haproxy.org/download/1.6/src/haproxy-1.6.14.tar.gz
ENV HAPROXY_SHA256 bac949838a3a497221d1a9e937d60cba32156783a216146a524ce40675b6b828
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
@@ -22,8 +22,7 @@ RUN set -x \
tar \
zlib-dev \
\
# install HAProxy
&& wget -O haproxy.tar.gz "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" \
&& 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 \
+2 -2
View File
@@ -1,8 +1,8 @@
# vim:set ft=dockerfile:
FROM debian:stretch-slim
ENV HAPROXY_MAJOR 1.7
ENV HAPROXY_VERSION 1.7.11
ENV HAPROXY_URL https://www.haproxy.org/download/1.7/src/haproxy-1.7.11.tar.gz
ENV HAPROXY_SHA256 d564b8e9429d1e8e13cb648bf4694926b472e36da1079df946bb732927b232ea
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
@@ -21,7 +21,7 @@ RUN set -x \
zlib1g-dev \
&& rm -rf /var/lib/apt/lists/* \
\
&& wget -O haproxy.tar.gz "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" \
&& 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 \
+2 -3
View File
@@ -1,8 +1,8 @@
# vim:set ft=dockerfile:
FROM alpine:3.8
ENV HAPROXY_MAJOR 1.7
ENV HAPROXY_VERSION 1.7.11
ENV HAPROXY_URL https://www.haproxy.org/download/1.7/src/haproxy-1.7.11.tar.gz
ENV HAPROXY_SHA256 d564b8e9429d1e8e13cb648bf4694926b472e36da1079df946bb732927b232ea
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
@@ -22,8 +22,7 @@ RUN set -x \
tar \
zlib-dev \
\
# install HAProxy
&& wget -O haproxy.tar.gz "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" \
&& 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 \
+2 -2
View File
@@ -1,8 +1,8 @@
# vim:set ft=dockerfile:
FROM debian:stretch-slim
ENV HAPROXY_MAJOR 1.8
ENV HAPROXY_VERSION 1.8.14
ENV HAPROXY_URL https://www.haproxy.org/download/1.8/src/haproxy-1.8.14.tar.gz
ENV HAPROXY_SHA256 b17e402578be85e58af7a3eac99b1f675953bea9f67af2e964cf8bdbd1bd3fdf
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
@@ -21,7 +21,7 @@ RUN set -x \
zlib1g-dev \
&& rm -rf /var/lib/apt/lists/* \
\
&& wget -O haproxy.tar.gz "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" \
&& 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 \
+2 -3
View File
@@ -1,8 +1,8 @@
# vim:set ft=dockerfile:
FROM alpine:3.8
ENV HAPROXY_MAJOR 1.8
ENV HAPROXY_VERSION 1.8.14
ENV HAPROXY_URL https://www.haproxy.org/download/1.8/src/haproxy-1.8.14.tar.gz
ENV HAPROXY_SHA256 b17e402578be85e58af7a3eac99b1f675953bea9f67af2e964cf8bdbd1bd3fdf
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
@@ -22,8 +22,7 @@ RUN set -x \
tar \
zlib-dev \
\
# install HAProxy
&& wget -O haproxy.tar.gz "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" \
&& 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 \
+63
View File
@@ -0,0 +1,63 @@
# vim:set ft=dockerfile:
FROM debian:stretch-slim
ENV HAPROXY_VERSION 1.9-dev9
ENV HAPROXY_URL https://www.haproxy.org/download/1.9/src/devel/haproxy-1.9-dev9.tar.gz
ENV HAPROXY_SHA256 48c4f1bca90df8a2ecbe846a79c13d3b02dc6d5f51587f7f431bcfc2cc829d08
# 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 \
libpcre3-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_LUA=1 LUA_INC=/usr/include/lua5.3 \
USE_OPENSSL=1 \
USE_PCRE=1 PCREDIR= \
USE_ZLIB=1 \
' \
&& make -C /usr/src/haproxy -j "$(nproc)" all $makeOpts \
&& 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"]
+62
View File
@@ -0,0 +1,62 @@
# vim:set ft=dockerfile:
FROM alpine:3.8
ENV HAPROXY_VERSION 1.9-dev9
ENV HAPROXY_URL https://www.haproxy.org/download/1.9/src/devel/haproxy-1.9-dev9.tar.gz
ENV HAPROXY_SHA256 48c4f1bca90df8a2ecbe846a79c13d3b02dc6d5f51587f7f431bcfc2cc829d08
# 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 \
ca-certificates \
gcc \
libc-dev \
linux-headers \
lua5.3-dev \
make \
openssl \
openssl-dev \
pcre-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_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 \
USE_OPENSSL=1 \
USE_PCRE=1 PCREDIR= \
USE_ZLIB=1 \
' \
&& make -C /usr/src/haproxy -j "$(getconf _NPROCESSORS_ONLN)" all $makeOpts \
&& 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 --virtual .haproxy-rundeps $runDeps \
&& apk del .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"]
+17
View File
@@ -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 "$@"
+17
View File
@@ -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 "$@"
+2 -3
View File
@@ -1,8 +1,8 @@
# vim:set ft=dockerfile:
FROM alpine:%%ALPINE_VERSION%%
ENV HAPROXY_MAJOR %%HAPROXY_MAJOR%%
ENV HAPROXY_VERSION %%HAPROXY_VERSION%%
ENV HAPROXY_URL %%HAPROXY_URL%%
ENV HAPROXY_SHA256 %%HAPROXY_SHA256%%
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
@@ -22,8 +22,7 @@ RUN set -x \
tar \
zlib-dev \
\
# install HAProxy
&& wget -O haproxy.tar.gz "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" \
&& 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 \
+2 -2
View File
@@ -1,8 +1,8 @@
# vim:set ft=dockerfile:
FROM debian:%%DEBIAN_VERSION%%
ENV HAPROXY_MAJOR %%HAPROXY_MAJOR%%
ENV HAPROXY_VERSION %%HAPROXY_VERSION%%
ENV HAPROXY_URL %%HAPROXY_URL%%
ENV HAPROXY_SHA256 %%HAPROXY_SHA256%%
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
@@ -21,7 +21,7 @@ RUN set -x \
zlib1g-dev \
&& rm -rf /var/lib/apt/lists/* \
\
&& wget -O haproxy.tar.gz "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" \
&& 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 \
+5 -2
View File
@@ -1,5 +1,5 @@
#!/bin/bash
set -eu
#!/usr/bin/env bash
set -Eeuo pipefail
declare -A aliases=(
[1.8]='1 latest'
@@ -12,6 +12,9 @@ cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
versions=( */ )
versions=( "${versions[@]%/}" )
# sort version numbers with highest first
IFS=$'\n'; versions=( $(echo "${versions[*]}" | sort -rV) ); unset IFS
# get the most recent commit which modified any of "$@"
fileCommit() {
git log -1 --format='format:%H' HEAD -- "$@"
+22 -10
View File
@@ -1,5 +1,5 @@
#!/bin/bash
set -eo pipefail
set -Eeuo pipefail
cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
@@ -28,22 +28,34 @@ for version in "${versions[@]}"; do
fi
fullVersion="$(
curl -sSL --compressed 'https://www.haproxy.org/download/'"$rcVersion"'/src/' \
| grep '<a href="haproxy-'"$version"'.*\.tar\.gz"' \
| grep $rcGrepV -E 'rc' \
| sed -r 's!.*<a href="haproxy-([^"/]+)\.tar\.gz".*!\1!' \
{
curl -fsSL --compressed 'https://www.haproxy.org/download/'"$rcVersion"'/src/'
if [ "$rcVersion" != "$version" ]; then
curl -fsSL --compressed 'https://www.haproxy.org/download/'"$rcVersion"'/src/devel/'
fi
} \
| grep -o '<a href="haproxy-'"$rcVersion"'[^"/]*\.tar\.gz"' \
| sed -r 's!^<a href="haproxy-([^"/]+)\.tar\.gz"$!\1!' \
| grep $rcGrepV -E 'rc|dev' \
| sort -V \
| tail -1
)"
sha256="$(curl -sSL --compressed 'https://www.haproxy.org/download/'"$rcVersion"'/src/haproxy-'"$fullVersion"'.tar.gz.sha256' | cut -d' ' -f1)"
url="https://www.haproxy.org/download/$rcVersion/src"
if [[ "$fullVersion" == *dev* ]]; then
url+='/devel'
fi
url+="/haproxy-$fullVersion.tar.gz"
sha256="$(curl -fsSL --compressed "$url.sha256" | cut -d' ' -f1)"
echo "$version: $fullVersion ($sha256, $url)"
versionSuite="${debianSuite[$version]:-$defaultDebianSuite}"
alpine="${alpineVersion[$version]:-$defaultAlpineVersion}"
sedExpr='
s/%%ALPINE_VERSION%%/'"$alpine"'/;
s/%%DEBIAN_VERSION%%/'"$versionSuite"'/;
s/%%HAPROXY_MAJOR%%/'"$rcVersion"'/;
s/%%HAPROXY_VERSION%%/'"$fullVersion"'/;
s!%%HAPROXY_URL%%!'"$url"'!;
s/%%HAPROXY_SHA256%%/'"$sha256"'/;
'
@@ -59,11 +71,11 @@ for version in "${versions[@]}"; do
s/libssl-dev/libssl1.0-dev/;
'
fi
( set -x; sed -r "$sedExpr" 'Dockerfile-debian.template' > "$version/Dockerfile" )
sed -r "$sedExpr" 'Dockerfile-debian.template' > "$version/Dockerfile"
for variant in alpine; do
[ -d "$version/$variant" ] || continue
( set -x; sed -r "$sedExpr" 'Dockerfile-alpine.template' > "$version/$variant/Dockerfile" )
sed -r "$sedExpr" 'Dockerfile-alpine.template' > "$version/$variant/Dockerfile"
travisEnv='\n - VERSION='"$version VARIANT=$variant$travisEnv"
done