From 8712936b9702ccf7a1e9ea57565b8bf5a565fc84 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Wed, 28 Feb 2018 12:16:39 +0300 Subject: [PATCH 1/5] MAINTAINER removed (cherry picked from commit 6f69039cbbf7b210fe16d578793db50e1cefdef8) --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 63ac90a..381a54c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -94,7 +94,6 @@ RUN set -x && \ make install FROM alpine:3.6 -MAINTAINER b4tman ENV SQUID_CONFIG_FILE /etc/squid/squid.conf ENV TZ Europe/Moscow From 102439a9b67263bee4f405c0e9987a71bc012699 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Wed, 28 Feb 2018 12:22:03 +0300 Subject: [PATCH 2/5] fix build error "Address not available" (cherry picked from commit a3b384fd875fd70e4244ef02b37791ce8b1194e9) --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 381a54c..96d2b01 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,11 @@ RUN set -x && \ RUN set -x && \ cd /tmp/build && \ export GNUPGHOME="$(mktemp -d)" && \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys ${SQUID_SIG_KEY} && \ + ( \ + gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys ${SQUID_SIG_KEY} || \ + gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys ${SQUID_SIG_KEY} || \ + gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys ${SQUID_SIG_KEY} \ + ) && \ gpg --batch --verify squid-${SQUID_VER}.tar.gz.asc squid-${SQUID_VER}.tar.gz && \ rm -rf "$GNUPGHOME" From 6996f4b15db478e31889164ca708e8374ea1f814 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Wed, 28 Feb 2018 12:29:52 +0300 Subject: [PATCH 3/5] bump alpine to 3.7 --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 96d2b01..98828e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.6 as build +FROM alpine:3.7 as build ENV SQUID_VER 3.5.27 ENV SQUID_SIG_KEY EA31CC5E9488E5168D2DCC5EB268E706FF5CF463 @@ -97,7 +97,7 @@ RUN set -x && \ make -j $(grep -cs ^processor /proc/cpuinfo) && \ make install -FROM alpine:3.6 +FROM alpine:3.7 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf ENV TZ Europe/Moscow @@ -110,8 +110,8 @@ RUN apk add --no-cache \ libstdc++ \ heimdal-libs \ libcap \ - libressl2.5-libcrypto \ - libressl2.5-libssl \ + libressl2.6-libcrypto \ + libressl2.6-libssl \ libltdl COPY --from=build /etc/squid/ /etc/squid/ From 9e6ed88e578abb44329988eb39177191318190a6 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Thu, 19 Jul 2018 13:33:38 +0300 Subject: [PATCH 4/5] bump to 3.5.28 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 98828e2..8e66575 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.7 as build -ENV SQUID_VER 3.5.27 +ENV SQUID_VER 3.5.28 ENV SQUID_SIG_KEY EA31CC5E9488E5168D2DCC5EB268E706FF5CF463 RUN set -x && \ From d5cbd68b4d50012238b5ef3dc227d23cad5c5fc8 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Thu, 19 Jul 2018 13:50:57 +0300 Subject: [PATCH 5/5] bump alpine to 3.8 --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8e66575..1553bb2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 as build +FROM alpine:3.8 as build ENV SQUID_VER 3.5.28 ENV SQUID_SIG_KEY EA31CC5E9488E5168D2DCC5EB268E706FF5CF463 @@ -97,7 +97,7 @@ RUN set -x && \ make -j $(grep -cs ^processor /proc/cpuinfo) && \ make install -FROM alpine:3.7 +FROM alpine:3.8 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf ENV TZ Europe/Moscow @@ -110,8 +110,8 @@ RUN apk add --no-cache \ libstdc++ \ heimdal-libs \ libcap \ - libressl2.6-libcrypto \ - libressl2.6-libssl \ + libressl2.7-libcrypto \ + libressl2.7-libssl \ libltdl COPY --from=build /etc/squid/ /etc/squid/