Merge pull request #58 from J0WI/https

Use "https" to fetch HAProxy Packages
This commit is contained in:
Tianon Gravi authored and GitHub committed 2018-01-22 10:10:39 -08:00
commit 3c97dfd39c
9 files changed
+23 -19

No files matched your search

+3 -3
View File
@@ -6,11 +6,11 @@ ENV HAPROXY_MAJOR 1.5
ENV HAPROXY_VERSION 1.5.19
ENV HAPROXY_MD5 74d49316f00e1fd9859bcac84ab04b5c
# 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' \
# see https://sources.debian.net/src/haproxy/1.5.8-1/debian/rules/ for some helpful navigation of the possible "make" arguments
RUN buildDeps='ca-certificates 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 \
&& curl -SL "https://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 \
+3 -2
View File
@@ -4,9 +4,10 @@ ENV HAPROXY_MAJOR 1.5
ENV HAPROXY_VERSION 1.5.19
ENV HAPROXY_MD5 74d49316f00e1fd9859bcac84ab04b5c
# see http://sources.debian.net/src/haproxy/1.5.8-1/debian/rules/ for some helpful navigation of the possible "make" arguments
# see https://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 \
ca-certificates \
curl \
gcc \
libc-dev \
@@ -15,7 +16,7 @@ RUN set -x \
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 \
&& curl -SL "https://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 \
+3 -2
View File
@@ -11,10 +11,11 @@ ENV HAPROXY_MAJOR 1.6
ENV HAPROXY_VERSION 1.6.14
ENV HAPROXY_MD5 5daf73eb70052e8ec66c40817f265202
# see http://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
RUN set -x \
\
&& buildDeps=' \
ca-certificates \
gcc \
libc6-dev \
liblua5.3-dev \
@@ -25,7 +26,7 @@ RUN set -x \
' \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
\
&& wget -O haproxy.tar.gz "http://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" \
&& wget -O haproxy.tar.gz "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.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 \
+2 -2
View File
@@ -8,7 +8,7 @@ ENV HAPROXY_MD5 5daf73eb70052e8ec66c40817f265202
ENV LUA_VERSION=5.3.4 \
LUA_SHA1=79790cfd40e09ba796b01a571d4d63b52b1cd950
# see http://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
# 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 \
@@ -43,7 +43,7 @@ RUN set -x \
&& rm -rf /usr/src/lua \
\
# install HAProxy
&& wget -O haproxy.tar.gz "http://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" \
&& wget -O haproxy.tar.gz "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.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 \
+3 -2
View File
@@ -11,10 +11,11 @@ ENV HAPROXY_MAJOR 1.7
ENV HAPROXY_VERSION 1.7.10
ENV HAPROXY_MD5 a9b98a228660dee5ee65b62e3bd57822
# see http://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
RUN set -x \
\
&& buildDeps=' \
ca-certificates \
gcc \
libc6-dev \
liblua5.3-dev \
@@ -25,7 +26,7 @@ RUN set -x \
' \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
\
&& wget -O haproxy.tar.gz "http://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" \
&& wget -O haproxy.tar.gz "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.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 \
+2 -2
View File
@@ -8,7 +8,7 @@ ENV HAPROXY_MD5 a9b98a228660dee5ee65b62e3bd57822
ENV LUA_VERSION=5.3.4 \
LUA_SHA1=79790cfd40e09ba796b01a571d4d63b52b1cd950
# see http://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
# 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 \
@@ -43,7 +43,7 @@ RUN set -x \
&& rm -rf /usr/src/lua \
\
# install HAProxy
&& wget -O haproxy.tar.gz "http://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" \
&& wget -O haproxy.tar.gz "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.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 \
+3 -2
View File
@@ -11,10 +11,11 @@ ENV HAPROXY_MAJOR 1.8
ENV HAPROXY_VERSION 1.8.3
ENV HAPROXY_MD5 2e1e3eb42f07983c9303c5622d812862
# see http://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
RUN set -x \
\
&& buildDeps=' \
ca-certificates \
gcc \
libc6-dev \
liblua5.3-dev \
@@ -26,7 +27,7 @@ RUN set -x \
' \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
\
&& wget -O haproxy.tar.gz "http://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" \
&& wget -O haproxy.tar.gz "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.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 \
+2 -2
View File
@@ -8,7 +8,7 @@ ENV HAPROXY_MD5 2e1e3eb42f07983c9303c5622d812862
ENV LUA_VERSION=5.3.4 \
LUA_SHA1=79790cfd40e09ba796b01a571d4d63b52b1cd950
# see http://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
# 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 \
@@ -43,7 +43,7 @@ RUN set -x \
&& rm -rf /usr/src/lua \
\
# install HAProxy
&& wget -O haproxy.tar.gz "http://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" \
&& wget -O haproxy.tar.gz "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.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 \
+2 -2
View File
@@ -18,14 +18,14 @@ for version in "${versions[@]}"; do
fi
fullVersion="$(
curl -sSL --compressed 'http://www.haproxy.org/download/'"$rcVersion"'/src/' \
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!' \
| sort -V \
| tail -1
)"
md5="$(curl -sSL --compressed 'http://www.haproxy.org/download/'"$rcVersion"'/src/haproxy-'"$fullVersion"'.tar.gz.md5' | cut -d' ' -f1)"
md5="$(curl -sSL --compressed 'https://www.haproxy.org/download/'"$rcVersion"'/src/haproxy-'"$fullVersion"'.tar.gz.md5' | cut -d' ' -f1)"
sedExpr='
s/^(ENV HAPROXY_MAJOR) .*/\1 '"$rcVersion"'/;
s/^(ENV HAPROXY_VERSION) .*/\1 '"$fullVersion"'/;