From d76be00039099fafaceeab939b0fa17f05203cb5 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 29 May 2020 15:17:27 -0700 Subject: [PATCH] Update to 2.1.5 --- 2.1/Dockerfile | 6 +++--- 2.1/alpine/Dockerfile | 8 ++++---- update.sh | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/2.1/Dockerfile b/2.1/Dockerfile index 44b3119..dd285c5 100644 --- a/2.1/Dockerfile +++ b/2.1/Dockerfile @@ -1,9 +1,9 @@ # vim:set ft=dockerfile: FROM debian:buster-slim -ENV HAPROXY_VERSION 2.1.4 -ENV HAPROXY_URL https://www.haproxy.org/download/2.1/src/haproxy-2.1.4.tar.gz -ENV HAPROXY_SHA256 51030ff696d7067162b4d24d354044293aecfbb36d7acc2f840c8d928bfe91cd +ENV HAPROXY_VERSION 2.1.5 +ENV HAPROXY_URL https://www.haproxy.org/download/2.1/src/haproxy-2.1.5.tar.gz +ENV HAPROXY_SHA256 42174ac5836ab243565b888299ec30115c1259e75872696708528260c6700ea1 # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments RUN set -x \ diff --git a/2.1/alpine/Dockerfile b/2.1/alpine/Dockerfile index 46499b4..7851073 100644 --- a/2.1/alpine/Dockerfile +++ b/2.1/alpine/Dockerfile @@ -1,9 +1,9 @@ # vim:set ft=dockerfile: FROM alpine:3.11 -ENV HAPROXY_VERSION 2.1.4 -ENV HAPROXY_URL https://www.haproxy.org/download/2.1/src/haproxy-2.1.4.tar.gz -ENV HAPROXY_SHA256 51030ff696d7067162b4d24d354044293aecfbb36d7acc2f840c8d928bfe91cd +ENV HAPROXY_VERSION 2.1.5 +ENV HAPROXY_URL https://www.haproxy.org/download/2.1/src/haproxy-2.1.5.tar.gz +ENV HAPROXY_SHA256 42174ac5836ab243565b888299ec30115c1259e75872696708528260c6700ea1 # 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=linux-glibc \ + TARGET=linux-musl \ USE_GETADDRINFO=1 \ USE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 \ USE_OPENSSL=1 \ diff --git a/update.sh b/update.sh index 993a302..a577bf0 100755 --- a/update.sh +++ b/update.sh @@ -71,7 +71,7 @@ for version in "${versions[@]}"; do /prometheus/d; ' fi - if [[ "$version" =~ 2.[01] ]]; then + if [ "$version" = '2.0' ]; then sedExpr+=' s/linux-musl/linux-glibc/; '