From fbf8924b471f678bbc7a4866a2beb0db37d7e9d0 Mon Sep 17 00:00:00 2001 From: J0WI Date: Sat, 20 Jan 2018 17:20:25 +0100 Subject: [PATCH 1/2] use "https" to fetch HAProxy Packages --- 1.5/Dockerfile | 4 ++-- 1.5/alpine/Dockerfile | 4 ++-- 1.6/Dockerfile | 4 ++-- 1.6/alpine/Dockerfile | 4 ++-- 1.7/Dockerfile | 4 ++-- 1.7/alpine/Dockerfile | 4 ++-- 1.8/Dockerfile | 4 ++-- 1.8/alpine/Dockerfile | 4 ++-- update.sh | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/1.5/Dockerfile b/1.5/Dockerfile index 774d999..9b81b35 100644 --- a/1.5/Dockerfile +++ b/1.5/Dockerfile @@ -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 +# see https://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' \ && 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 \ diff --git a/1.5/alpine/Dockerfile b/1.5/alpine/Dockerfile index b83b255..80817d7 100644 --- a/1.5/alpine/Dockerfile +++ b/1.5/alpine/Dockerfile @@ -4,7 +4,7 @@ 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 \ curl \ @@ -15,7 +15,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 \ diff --git a/1.6/Dockerfile b/1.6/Dockerfile index f509654..adffce4 100644 --- a/1.6/Dockerfile +++ b/1.6/Dockerfile @@ -11,7 +11,7 @@ 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=' \ @@ -25,7 +25,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 \ diff --git a/1.6/alpine/Dockerfile b/1.6/alpine/Dockerfile index 54c9df4..4f2e5bc 100644 --- a/1.6/alpine/Dockerfile +++ b/1.6/alpine/Dockerfile @@ -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 \ diff --git a/1.7/Dockerfile b/1.7/Dockerfile index 01a3ee4..b69783e 100644 --- a/1.7/Dockerfile +++ b/1.7/Dockerfile @@ -11,7 +11,7 @@ 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=' \ @@ -25,7 +25,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 \ diff --git a/1.7/alpine/Dockerfile b/1.7/alpine/Dockerfile index f871ded..262cb44 100644 --- a/1.7/alpine/Dockerfile +++ b/1.7/alpine/Dockerfile @@ -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 \ diff --git a/1.8/Dockerfile b/1.8/Dockerfile index 72053a2..85b6091 100644 --- a/1.8/Dockerfile +++ b/1.8/Dockerfile @@ -11,7 +11,7 @@ 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=' \ @@ -26,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 \ diff --git a/1.8/alpine/Dockerfile b/1.8/alpine/Dockerfile index ce38bb8..9543855 100644 --- a/1.8/alpine/Dockerfile +++ b/1.8/alpine/Dockerfile @@ -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 \ diff --git a/update.sh b/update.sh index 8b22871..a7500d7 100755 --- a/update.sh +++ b/update.sh @@ -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 ' Date: Sat, 20 Jan 2018 17:34:40 +0100 Subject: [PATCH 2/2] Add "ca-certificates" to "buildDeps" --- 1.5/Dockerfile | 2 +- 1.5/alpine/Dockerfile | 1 + 1.6/Dockerfile | 1 + 1.7/Dockerfile | 1 + 1.8/Dockerfile | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/1.5/Dockerfile b/1.5/Dockerfile index 9b81b35..58e27ac 100644 --- a/1.5/Dockerfile +++ b/1.5/Dockerfile @@ -7,7 +7,7 @@ ENV HAPROXY_VERSION 1.5.19 ENV HAPROXY_MD5 74d49316f00e1fd9859bcac84ab04b5c # see https://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' \ +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 "https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz" -o haproxy.tar.gz \ diff --git a/1.5/alpine/Dockerfile b/1.5/alpine/Dockerfile index 80817d7..11c2bcd 100644 --- a/1.5/alpine/Dockerfile +++ b/1.5/alpine/Dockerfile @@ -7,6 +7,7 @@ ENV HAPROXY_MD5 74d49316f00e1fd9859bcac84ab04b5c # 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 \ diff --git a/1.6/Dockerfile b/1.6/Dockerfile index adffce4..aa942fc 100644 --- a/1.6/Dockerfile +++ b/1.6/Dockerfile @@ -15,6 +15,7 @@ ENV HAPROXY_MD5 5daf73eb70052e8ec66c40817f265202 RUN set -x \ \ && buildDeps=' \ + ca-certificates \ gcc \ libc6-dev \ liblua5.3-dev \ diff --git a/1.7/Dockerfile b/1.7/Dockerfile index b69783e..6bb0b4c 100644 --- a/1.7/Dockerfile +++ b/1.7/Dockerfile @@ -15,6 +15,7 @@ ENV HAPROXY_MD5 a9b98a228660dee5ee65b62e3bd57822 RUN set -x \ \ && buildDeps=' \ + ca-certificates \ gcc \ libc6-dev \ liblua5.3-dev \ diff --git a/1.8/Dockerfile b/1.8/Dockerfile index 85b6091..43d67f1 100644 --- a/1.8/Dockerfile +++ b/1.8/Dockerfile @@ -15,6 +15,7 @@ ENV HAPROXY_MD5 2e1e3eb42f07983c9303c5622d812862 RUN set -x \ \ && buildDeps=' \ + ca-certificates \ gcc \ libc6-dev \ liblua5.3-dev \