From d059b7d2cd65dcf70875a0418085747976cb6b50 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Tue, 16 May 2017 11:49:14 +0300
Subject: [PATCH 01/72] upd to squid v4.0.19

---
 Dockerfile | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6fb3fce..d266ebe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
 FROM alpine:3.5
 MAINTAINER b4tman <b4tm4n@mail.ru>
 
-ENV SQUID_VER 3.5.25
-ENV SQUID_SIG_KEY EA31CC5E9488E5168D2DCC5EB268E706FF5CF463
+ENV SQUID_VER 4.0.19
+ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow
 
@@ -12,10 +12,9 @@ RUN set -x && \
 
 RUN apk add --no-cache \
 		libstdc++ \
-		heimdal-libs \
 		libcap \
-		libressl2.4-libcrypto \
-		libressl2.4-libssl \
+		libcrypto1.0 \
+		libssl1.0 \
 		libltdl
 
 RUN set -x && \
@@ -27,21 +26,20 @@ RUN set -x && \
 		tzdata \
 		curl \
 		gnupg \
-		libressl-dev \
+		openssl-dev \
 		perl-dev \
 		autoconf \
 		automake \
 		make \
 		pkgconfig \
-		heimdal-dev \
 		libtool \
 		libcap-dev \
 		linux-headers && \
 	\
 	mkdir -p /tmp/build && \
 	cd /tmp/build && \
-    curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%.*.*}/${SQUID_VER%.*}/squid-${SQUID_VER}.tar.gz -o squid-${SQUID_VER}.tar.gz && \
-	curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%.*.*}/${SQUID_VER%.*}/squid-${SQUID_VER}.tar.gz.asc -o squid-${SQUID_VER}.tar.gz.asc	&& \
+    curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%.*.*}/squid-${SQUID_VER}.tar.gz -o squid-${SQUID_VER}.tar.gz && \
+	curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%.*.*}/squid-${SQUID_VER}.tar.gz.asc -o squid-${SQUID_VER}.tar.gz.asc	&& \
 	\
 	export GNUPGHOME="$(mktemp -d)" && \
 	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys ${SQUID_SIG_KEY}	&& \
@@ -71,11 +69,12 @@ RUN set -x && \
 		--enable-auth-negotiate="wrapper" \
 		--enable-silent-rules \
 		--disable-mit \
-		--enable-heimdal \
+		--disable-heimdal \
 		--enable-delay-pools \
 		--enable-arp-acl \
 		--enable-openssl \
 		--enable-ssl-crtd \
+		--enable-security-cert-generators="file" \
 		--enable-ident-lookups \
 		--enable-useragent-log \
 		--enable-cache-digests \
@@ -119,4 +118,4 @@ EXPOSE 3128/tcp
 
 USER squid
 
-CMD ["sh", "-c", "/usr/sbin/squid -f ${SQUID_CONFIG_FILE} -z && exec /usr/sbin/squid -f ${SQUID_CONFIG_FILE} -NYCd 1"]
+CMD ["sh", "-c", "/usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -z && exec /usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -YCd 1"]

From 5ea9da078259ee7428dff4e15a24176089dabb1a Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Tue, 6 Jun 2017 19:42:08 +0300
Subject: [PATCH 02/72] update to 4.0.20

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d266ebe..78b1525 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.5
 MAINTAINER b4tman <b4tm4n@mail.ru>
 
-ENV SQUID_VER 4.0.19
+ENV SQUID_VER 4.0.20
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow

From 7393b0da870259385a44a70e081ab3276d215427 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 7 Jun 2017 14:12:20 +0300
Subject: [PATCH 03/72] fix "LOCK_UN" build error

../../src/base/File.h:54:21: error: 'LOCK_UN' was not declared in this scope
---
 Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 78b1525..906a362 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -94,7 +94,10 @@ RUN set -x && \
 		--with-large-files \
 		--with-default-user=squid \
 		--with-openssl \
-		--with-pidfile=/var/run/squid/squid.pid \
+		--with-pidfile=/var/run/squid/squid.pid && \
+	\
+	sed -ie 's/LOCK_UN/8/g' src/base/File.h && \
+	\
 	make && \
 	make install && \
 	install -d -o squid -g squid \

From 25d8d427fe56c4ae94d35d3f1ec83c861539584f Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Mon, 3 Jul 2017 13:37:44 +0300
Subject: [PATCH 04/72] fix LOCK_UN build error (2)

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 906a362..8b9bbf1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -96,7 +96,7 @@ RUN set -x && \
 		--with-openssl \
 		--with-pidfile=/var/run/squid/squid.pid && \
 	\
-	sed -ie 's/LOCK_UN/8/g' src/base/File.h && \
+	sed -i -e 's/LOCK_UN/8/g' src/base/File.h && \
 	\
 	make && \
 	make install && \

From 8a016f4d1eefed3b9b5f4a0a1a72a6b7704f5107 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Mon, 3 Jul 2017 13:41:13 +0300
Subject: [PATCH 05/72] bump alpine to 3.6

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8b9bbf1..b60982b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.6
 MAINTAINER b4tman <b4tm4n@mail.ru>
 
 ENV SQUID_VER 4.0.20

From b42486dc8823c58e664b4ff003117e4af327e120 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Mon, 3 Jul 2017 13:42:52 +0300
Subject: [PATCH 06/72] bump squid to 4.0.21

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b60982b..0adaf8d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.6
 MAINTAINER b4tman <b4tm4n@mail.ru>
 
-ENV SQUID_VER 4.0.20
+ENV SQUID_VER 4.0.21
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow

From bd235e7e19e4476f35d0f340629b753248aefd05 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Mon, 3 Jul 2017 13:45:19 +0300
Subject: [PATCH 07/72] back to libressl

---
 Dockerfile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0adaf8d..62fd78b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,8 +13,8 @@ RUN set -x && \
 RUN apk add --no-cache \
 		libstdc++ \
 		libcap \
-		libcrypto1.0 \
-		libssl1.0 \
+		libressl2.5-libcrypto \
+		libressl2.5-libssl \
 		libltdl
 
 RUN set -x && \
@@ -26,12 +26,13 @@ RUN set -x && \
 		tzdata \
 		curl \
 		gnupg \
-		openssl-dev \
+		libressl-dev \
 		perl-dev \
 		autoconf \
 		automake \
 		make \
 		pkgconfig \
+		heimdal-dev \
 		libtool \
 		libcap-dev \
 		linux-headers && \
@@ -69,7 +70,7 @@ RUN set -x && \
 		--enable-auth-negotiate="wrapper" \
 		--enable-silent-rules \
 		--disable-mit \
-		--disable-heimdal \
+		--enable-heimdal \
 		--enable-delay-pools \
 		--enable-arp-acl \
 		--enable-openssl \

From cbce834670e2711305926da3848484d56819db97 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 20 Sep 2017 11:25:44 +0300
Subject: [PATCH 08/72] bump squid to 3.5.27

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ae27390..240d9c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.6
 MAINTAINER b4tman <b4tm4n@mail.ru>
 
-ENV SQUID_VER 3.5.26
+ENV SQUID_VER 3.5.27
 ENV SQUID_SIG_KEY EA31CC5E9488E5168D2DCC5EB268E706FF5CF463
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow

From f2f586f586fad90b1292e64fb68b4778dbba5601 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 20 Sep 2017 11:25:44 +0300
Subject: [PATCH 09/72] bump squid to 3.5.27

(cherry picked from commit cbce834670e2711305926da3848484d56819db97)
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 0a7a23d..6afe4a5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM armhf/alpine:3.6
 MAINTAINER b4tman <b4tm4n@mail.ru>
 
-ENV SQUID_VER 3.5.26
+ENV SQUID_VER 3.5.27
 ENV SQUID_SIG_KEY EA31CC5E9488E5168D2DCC5EB268E706FF5CF463
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow

From be6513f8358d87010d32493ad24357bf3da28db6 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 20 Sep 2017 13:49:43 +0300
Subject: [PATCH 10/72] FROM container4armhf/armhf-alpine

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6afe4a5..d823912 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM armhf/alpine:3.6
+FROM container4armhf/armhf-alpine:3.6
 MAINTAINER b4tman <b4tm4n@mail.ru>
 
 ENV SQUID_VER 3.5.27

From 2c8641472ecff66110c73dbeed9e9a52609af9af Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 20 Sep 2017 13:52:46 +0300
Subject: [PATCH 11/72] update README

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index dd8dd02..bc1a52b 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,6 @@ Docker Squid container based on Alpine Linux.
 
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/b4tman/squid).
 
-> **Note**: [armhf](https://github.com/b4tman/docker-squid/tree/armhf) image is based on **experimental** [armhf/alpine](https://hub.docker.com/r/armhf/alpine/) image. 
-
 # Quick Start
 
 Just launch container:

From fe0e5831e15bee59ae384f4f25284f667f110360 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 20 Sep 2017 13:52:46 +0300
Subject: [PATCH 12/72] update README

(cherry picked from commit 2c8641472ecff66110c73dbeed9e9a52609af9af)
---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 5caadb3..cc4f388 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,6 @@ Docker Squid container based on Alpine Linux.
 
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/b4tman/squid).
 
-> **Note**: [armhf](https://github.com/b4tman/docker-squid/tree/armhf) image is based on **experimental** [armhf/alpine](https://hub.docker.com/r/armhf/alpine/) image. 
-
 # Quick Start
 
 Just launch container:

From e89dd2383a62e876c992d7e4101726ce3c8b94a2 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 20 Sep 2017 13:52:46 +0300
Subject: [PATCH 13/72] update README

(cherry picked from commit 2c8641472ecff66110c73dbeed9e9a52609af9af)
---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 5caadb3..cc4f388 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,6 @@ Docker Squid container based on Alpine Linux.
 
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/b4tman/squid).
 
-> **Note**: [armhf](https://github.com/b4tman/docker-squid/tree/armhf) image is based on **experimental** [armhf/alpine](https://hub.docker.com/r/armhf/alpine/) image. 
-
 # Quick Start
 
 Just launch container:

From 2c911aad44d967fc74db12fde52cd50480f23e1e Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 28 Feb 2018 11:31:21 +0300
Subject: [PATCH 14/72] FROM arm32v6/alpine

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d823912..5759166 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM container4armhf/armhf-alpine:3.6
+FROM arm32v6/alpine:3.6
 MAINTAINER b4tman <b4tm4n@mail.ru>
 
 ENV SQUID_VER 3.5.27

From 9e51552e39e70354d288a3af90dfe1baf2a88b69 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 28 Feb 2018 11:32:26 +0300
Subject: [PATCH 15/72] MAINTAINER removed

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5759166..0aef877 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
 FROM arm32v6/alpine:3.6
-MAINTAINER b4tman <b4tm4n@mail.ru>
 
 ENV SQUID_VER 3.5.27
 ENV SQUID_SIG_KEY EA31CC5E9488E5168D2DCC5EB268E706FF5CF463

From c7d9736e2e9918af06774a7bcc771a8c6dafc486 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Thu, 21 Sep 2017 10:50:41 +0300
Subject: [PATCH 16/72] parallel compile jobs

(cherry picked from commit 27509b05f60b99641cfc1565e210a274c0d71f7b)
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 240d9c8..dbdba6b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -95,8 +95,8 @@ RUN set -x && \
 		--with-large-files \
 		--with-default-user=squid \
 		--with-openssl \
-		--with-pidfile=/var/run/squid/squid.pid \
-	make && \
+		--with-pidfile=/var/run/squid/squid.pid && \
+	make -j $(grep -cs ^processor /proc/cpuinfo) && \
 	make install && \
 	install -d -o squid -g squid \
 		/var/cache/squid \

From dcb8862e7525836d480b2a33187103b3043a8f9a Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Fri, 22 Sep 2017 14:41:21 +0300
Subject: [PATCH 17/72] multi-stage build

---
 Dockerfile | 93 ++++++++++++++++++++++++++++++++----------------------
 1 file changed, 55 insertions(+), 38 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dbdba6b..63ac90a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,30 +1,13 @@
-FROM alpine:3.6
-MAINTAINER b4tman <b4tm4n@mail.ru>
+FROM alpine:3.6 as build
 
 ENV SQUID_VER 3.5.27
 ENV SQUID_SIG_KEY EA31CC5E9488E5168D2DCC5EB268E706FF5CF463
-ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
-ENV TZ Europe/Moscow
 
 RUN set -x && \
-	deluser squid 2>/dev/null; delgroup squid 2>/dev/null; \
-	addgroup -S squid -g 3128 && adduser -S -u 3128 -G squid -g squid -H -D -s /bin/false -h /var/cache/squid squid
-
-RUN apk add --no-cache \
-		libstdc++ \
-		heimdal-libs \
-		libcap \
-		libressl2.5-libcrypto \
-		libressl2.5-libssl \
-		libltdl
-
-RUN set -x && \
-	apk add --no-cache --virtual .build-deps  \
+	apk add --no-cache  \
 		gcc \
 		g++ \
 		libc-dev \
-		alpine-conf \
-		tzdata \
 		curl \
 		gnupg \
 		libressl-dev \
@@ -36,21 +19,29 @@ RUN set -x && \
 		heimdal-dev \
 		libtool \
 		libcap-dev \
-		linux-headers && \
-	\
+		linux-headers
+
+RUN set -x && \
 	mkdir -p /tmp/build && \
 	cd /tmp/build && \
     curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%.*.*}/${SQUID_VER%.*}/squid-${SQUID_VER}.tar.gz -o squid-${SQUID_VER}.tar.gz && \
-	curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%.*.*}/${SQUID_VER%.*}/squid-${SQUID_VER}.tar.gz.asc -o squid-${SQUID_VER}.tar.gz.asc	&& \
-	\
+	curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%.*.*}/${SQUID_VER%.*}/squid-${SQUID_VER}.tar.gz.asc -o squid-${SQUID_VER}.tar.gz.asc	
+	
+RUN set -x && \
+	cd /tmp/build && \
 	export GNUPGHOME="$(mktemp -d)" && \
 	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys ${SQUID_SIG_KEY}	&& \
 	gpg --batch --verify squid-${SQUID_VER}.tar.gz.asc squid-${SQUID_VER}.tar.gz && \
-	\
+	rm -rf "$GNUPGHOME"
+	
+RUN set -x && \
+	cd /tmp/build && \	
 	tar --strip 1 -xzf squid-${SQUID_VER}.tar.gz && \
-	export CFLAGS="-g0 -O2"   && \
-	export CXXFLAGS="$CFLAGS" && \
-	export LDFLAGS="-s" && \
+	\
+	CFLAGS="-g0 -O2" \
+	CXXFLAGS="-g0 -O2" \
+	LDFLAGS="-s" \
+	\
 	./configure \
 		--build="$(uname -m)" \
 		--host="$(uname -m)" \
@@ -95,24 +86,50 @@ RUN set -x && \
 		--with-large-files \
 		--with-default-user=squid \
 		--with-openssl \
-		--with-pidfile=/var/run/squid/squid.pid && \
+		--with-pidfile=/var/run/squid/squid.pid
+
+RUN set -x && \
+	cd /tmp/build && \
 	make -j $(grep -cs ^processor /proc/cpuinfo) && \
-	make install && \
-	install -d -o squid -g squid \
+	make install
+
+FROM alpine:3.6
+MAINTAINER b4tman <b4tm4n@mail.ru>
+	
+ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
+ENV TZ Europe/Moscow
+
+RUN set -x && \
+	deluser squid 2>/dev/null; delgroup squid 2>/dev/null; \
+	addgroup -S squid -g 3128 && adduser -S -u 3128 -G squid -g squid -H -D -s /bin/false -h /var/cache/squid squid
+
+RUN apk add --no-cache \
+		libstdc++ \
+		heimdal-libs \
+		libcap \
+		libressl2.5-libcrypto \
+		libressl2.5-libssl \
+		libltdl	
+
+COPY --from=build /etc/squid/ /etc/squid/
+COPY --from=build /usr/lib/squid/ /usr/lib/squid/
+COPY --from=build /usr/share/squid/ /usr/share/squid/
+COPY --from=build /usr/sbin/squid /usr/sbin/squid
+		
+RUN install -d -o squid -g squid \
 		/var/cache/squid \
 		/var/log/squid \
 		/var/run/squid && \
-	chmod +x /usr/lib/squid/* &&\
-	\
-	/sbin/setup-timezone -z $TZ && \
-	\
-	apk del .build-deps && \
-	cd / && \
-	rm -rf /tmp/build "$GNUPGHOME"
-
+	chmod +x /usr/lib/squid/*
+	
 RUN echo 'include /etc/squid/conf.d/*.conf' >> "$SQUID_CONFIG_FILE" && \
 	install -d -m 755 -o squid -g squid /etc/squid/conf.d
 COPY squid-log.conf /etc/squid/conf.d/
+
+RUN	set -x && \
+	apk add --no-cache --virtual .tz alpine-conf tzdata && \ 
+	/sbin/setup-timezone -z $TZ && \
+	apk del .tz 	
 	
 VOLUME ["/var/cache/squid"]	
 EXPOSE 3128/tcp

From 6f69039cbbf7b210fe16d578793db50e1cefdef8 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 28 Feb 2018 12:16:39 +0300
Subject: [PATCH 18/72] MAINTAINER removed

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e188e88..9fb238e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -97,7 +97,6 @@ RUN set -x && \
 	make install
 
 FROM alpine:3.6
-MAINTAINER b4tman <b4tm4n@mail.ru>
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow

From a3b384fd875fd70e4244ef02b37791ce8b1194e9 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 28 Feb 2018 12:22:03 +0300
Subject: [PATCH 19/72] fix build error "Address not available"

---
 Dockerfile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9fb238e..a0d84ef 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 8712936b9702ccf7a1e9ea57565b8bf5a565fc84 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 28 Feb 2018 12:16:39 +0300
Subject: [PATCH 20/72] 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 <b4tm4n@mail.ru>
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow

From 102439a9b67263bee4f405c0e9987a71bc012699 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 28 Feb 2018 12:22:03 +0300
Subject: [PATCH 21/72] 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 <b4tm4n@mail.ru>
Date: Wed, 28 Feb 2018 12:29:52 +0300
Subject: [PATCH 22/72] 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 6c614c0f902e32f4273af0665293a127b3e4676e Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 28 Feb 2018 12:35:28 +0300
Subject: [PATCH 23/72] fix v4 src url

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a0d84ef..12c4edc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,8 +24,8 @@ RUN set -x && \
 RUN set -x && \
 	mkdir -p /tmp/build && \
 	cd /tmp/build && \
-    curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%.*.*}/${SQUID_VER%.*}/squid-${SQUID_VER}.tar.gz -o squid-${SQUID_VER}.tar.gz && \
-	curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%.*.*}/${SQUID_VER%.*}/squid-${SQUID_VER}.tar.gz.asc -o squid-${SQUID_VER}.tar.gz.asc	
+    curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%.*.*}/squid-${SQUID_VER}.tar.gz -o squid-${SQUID_VER}.tar.gz && \
+	curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%.*.*}/squid-${SQUID_VER}.tar.gz.asc -o squid-${SQUID_VER}.tar.gz.asc	
 	
 RUN set -x && \
 	cd /tmp/build && \

From 9b081c8cecc31fe11e6ab125d61e8039a2a5045d Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 28 Feb 2018 12:29:52 +0300
Subject: [PATCH 24/72] bump alpine to 3.7

(cherry picked from commit 6996f4b15db478e31889164ca708e8374ea1f814)
---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 12c4edc..163acb5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.6 as build
+FROM alpine:3.7 as build
 
 ENV SQUID_VER 4.0.21
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
@@ -100,7 +100,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
@@ -113,8 +113,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 11434c9296275a6aa4ed1d0a004d1de1ec4b7846 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 28 Feb 2018 12:39:35 +0300
Subject: [PATCH 25/72] parallel compile jobs

(cherry picked from commit 27509b05f60b99641cfc1565e210a274c0d71f7b)
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0aef877..f4137cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -94,8 +94,8 @@ RUN set -x && \
 		--with-large-files \
 		--with-default-user=squid \
 		--with-openssl \
-		--with-pidfile=/var/run/squid/squid.pid \
-	make && \
+		--with-pidfile=/var/run/squid/squid.pid && \
+	make -j $(grep -cs ^processor /proc/cpuinfo) && \
 	make install && \
 	install -d -o squid -g squid \
 		/var/cache/squid \

From d92da9a79d65b2fe9f2c4eca307b5216ac26f1af Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 28 Feb 2018 12:43:05 +0300
Subject: [PATCH 26/72] multi-stage build

(cherry picked from commit dcb8862e7525836d480b2a33187103b3043a8f9a)
---
 Dockerfile | 92 ++++++++++++++++++++++++++++++++----------------------
 1 file changed, 55 insertions(+), 37 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f4137cf..b3f8f64 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,29 +1,13 @@
-FROM arm32v6/alpine:3.6
+FROM arm32v6/alpine:3.6 as build
 
 ENV SQUID_VER 3.5.27
 ENV SQUID_SIG_KEY EA31CC5E9488E5168D2DCC5EB268E706FF5CF463
-ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
-ENV TZ Europe/Moscow
 
 RUN set -x && \
-	deluser squid 2>/dev/null; delgroup squid 2>/dev/null; \
-	addgroup -S squid -g 3128 && adduser -S -u 3128 -G squid -g squid -H -D -s /bin/false -h /var/cache/squid squid
-
-RUN apk add --no-cache \
-		libstdc++ \
-		heimdal-libs \
-		libcap \
-		libressl2.5-libcrypto \
-		libressl2.5-libssl \
-		libltdl
-
-RUN set -x && \
-	apk add --no-cache --virtual .build-deps  \
+	apk add --no-cache  \
 		gcc \
 		g++ \
 		libc-dev \
-		alpine-conf \
-		tzdata \
 		curl \
 		gnupg \
 		libressl-dev \
@@ -35,21 +19,29 @@ RUN set -x && \
 		heimdal-dev \
 		libtool \
 		libcap-dev \
-		linux-headers && \
-	\
+		linux-headers
+
+RUN set -x && \
 	mkdir -p /tmp/build && \
 	cd /tmp/build && \
     curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%.*.*}/${SQUID_VER%.*}/squid-${SQUID_VER}.tar.gz -o squid-${SQUID_VER}.tar.gz && \
-	curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%.*.*}/${SQUID_VER%.*}/squid-${SQUID_VER}.tar.gz.asc -o squid-${SQUID_VER}.tar.gz.asc	&& \
-	\
+	curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%.*.*}/${SQUID_VER%.*}/squid-${SQUID_VER}.tar.gz.asc -o squid-${SQUID_VER}.tar.gz.asc	
+	
+RUN set -x && \
+	cd /tmp/build && \
 	export GNUPGHOME="$(mktemp -d)" && \
 	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys ${SQUID_SIG_KEY}	&& \
 	gpg --batch --verify squid-${SQUID_VER}.tar.gz.asc squid-${SQUID_VER}.tar.gz && \
-	\
+	rm -rf "$GNUPGHOME"
+	
+RUN set -x && \
+	cd /tmp/build && \	
 	tar --strip 1 -xzf squid-${SQUID_VER}.tar.gz && \
-	export CFLAGS="-g0 -O2"   && \
-	export CXXFLAGS="$CFLAGS" && \
-	export LDFLAGS="-s" && \
+	\
+	CFLAGS="-g0 -O2" \
+	CXXFLAGS="-g0 -O2" \
+	LDFLAGS="-s" \
+	\
 	./configure \
 		--build="$(uname -m)" \
 		--host="$(uname -m)" \
@@ -94,24 +86,50 @@ RUN set -x && \
 		--with-large-files \
 		--with-default-user=squid \
 		--with-openssl \
-		--with-pidfile=/var/run/squid/squid.pid && \
+		--with-pidfile=/var/run/squid/squid.pid
+
+RUN set -x && \
+	cd /tmp/build && \
 	make -j $(grep -cs ^processor /proc/cpuinfo) && \
-	make install && \
-	install -d -o squid -g squid \
+	make install
+
+FROM arm32v6/alpine:3.6
+MAINTAINER b4tman <b4tm4n@mail.ru>
+	
+ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
+ENV TZ Europe/Moscow
+
+RUN set -x && \
+	deluser squid 2>/dev/null; delgroup squid 2>/dev/null; \
+	addgroup -S squid -g 3128 && adduser -S -u 3128 -G squid -g squid -H -D -s /bin/false -h /var/cache/squid squid
+
+RUN apk add --no-cache \
+		libstdc++ \
+		heimdal-libs \
+		libcap \
+		libressl2.5-libcrypto \
+		libressl2.5-libssl \
+		libltdl	
+
+COPY --from=build /etc/squid/ /etc/squid/
+COPY --from=build /usr/lib/squid/ /usr/lib/squid/
+COPY --from=build /usr/share/squid/ /usr/share/squid/
+COPY --from=build /usr/sbin/squid /usr/sbin/squid
+		
+RUN install -d -o squid -g squid \
 		/var/cache/squid \
 		/var/log/squid \
 		/var/run/squid && \
-	chmod +x /usr/lib/squid/* &&\
-	\
-	/sbin/setup-timezone -z $TZ && \
-	\
-	apk del .build-deps && \
-	cd / && \
-	rm -rf /tmp/build "$GNUPGHOME"
-
+	chmod +x /usr/lib/squid/*
+	
 RUN echo 'include /etc/squid/conf.d/*.conf' >> "$SQUID_CONFIG_FILE" && \
 	install -d -m 755 -o squid -g squid /etc/squid/conf.d
 COPY squid-log.conf /etc/squid/conf.d/
+
+RUN	set -x && \
+	apk add --no-cache --virtual .tz alpine-conf tzdata && \ 
+	/sbin/setup-timezone -z $TZ && \
+	apk del .tz 	
 	
 VOLUME ["/var/cache/squid"]	
 EXPOSE 3128/tcp

From 7ac8996e394d285b01e19d60a76c12ba5d1a065c Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 28 Feb 2018 12:29:52 +0300
Subject: [PATCH 27/72] bump alpine to 3.7

(cherry picked from commit 6996f4b15db478e31889164ca708e8374ea1f814)
---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b3f8f64..718025e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM arm32v6/alpine:3.6 as build
+FROM arm32v6/alpine:3.7 as build
 
 ENV SQUID_VER 3.5.27
 ENV SQUID_SIG_KEY EA31CC5E9488E5168D2DCC5EB268E706FF5CF463
@@ -93,7 +93,7 @@ RUN set -x && \
 	make -j $(grep -cs ^processor /proc/cpuinfo) && \
 	make install
 
-FROM arm32v6/alpine:3.6
+FROM arm32v6/alpine:3.7
 MAINTAINER b4tman <b4tm4n@mail.ru>
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
@@ -107,8 +107,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 63c7ba99e91d514398bb736cdea33e5865457956 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 28 Feb 2018 12:47:57 +0300
Subject: [PATCH 28/72] MAINTAINER removed

(cherry picked from commit 6f69039cbbf7b210fe16d578793db50e1cefdef8)
---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 718025e..d747964 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -94,7 +94,6 @@ RUN set -x && \
 	make install
 
 FROM arm32v6/alpine:3.7
-MAINTAINER b4tman <b4tm4n@mail.ru>
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow

From 2a8b885fad13602e20039adbd331651247886530 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 28 Feb 2018 13:14:45 +0300
Subject: [PATCH 29/72] bump to 4.0.23

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 163acb5..58e52ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.7 as build
 
-ENV SQUID_VER 4.0.21
+ENV SQUID_VER 4.0.23
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
 
 RUN set -x && \

From b5e86101ef9c35b148197067bd86ecb40a4590a1 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 28 Feb 2018 13:17:32 +0300
Subject: [PATCH 30/72] 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 d747964..d03d0be 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 e4d312e05ef001aff0d584426450871c9f708ea4 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Tue, 15 May 2018 10:05:55 +0300
Subject: [PATCH 31/72] bump to 4.0.23

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 58e52ee..56ff664 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.7 as build
 
-ENV SQUID_VER 4.0.23
+ENV SQUID_VER 4.0.24
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
 
 RUN set -x && \

From d26782c0b3db298764e7984a7930ae09b10af472 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Mon, 16 Jul 2018 14:01:49 +0300
Subject: [PATCH 32/72] fix URL templates

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 56ff664..2a5ba2c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,8 +24,8 @@ RUN set -x && \
 RUN set -x && \
 	mkdir -p /tmp/build && \
 	cd /tmp/build && \
-    curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%.*.*}/squid-${SQUID_VER}.tar.gz -o squid-${SQUID_VER}.tar.gz && \
-	curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%.*.*}/squid-${SQUID_VER}.tar.gz.asc -o squid-${SQUID_VER}.tar.gz.asc	
+    curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%%.*}/squid-${SQUID_VER}.tar.gz -o squid-${SQUID_VER}.tar.gz && \
+	curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%%.*}/squid-${SQUID_VER}.tar.gz.asc -o squid-${SQUID_VER}.tar.gz.asc
 	
 RUN set -x && \
 	cd /tmp/build && \

From 7ae134af146446a421442fcc8e0e62eff6f7a85d Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Mon, 16 Jul 2018 14:02:38 +0300
Subject: [PATCH 33/72] bump to 4.1

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 2a5ba2c..97c6819 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.7 as build
 
-ENV SQUID_VER 4.0.24
+ENV SQUID_VER 4.1
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
 
 RUN set -x && \

From 9e6ed88e578abb44329988eb39177191318190a6 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Thu, 19 Jul 2018 13:33:38 +0300
Subject: [PATCH 34/72] 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 <b4tm4n@mail.ru>
Date: Thu, 19 Jul 2018 13:50:57 +0300
Subject: [PATCH 35/72] 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/

From 9f6c88ad96fc5108256aaf7c6c89885506aced34 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Thu, 19 Jul 2018 13:33:38 +0300
Subject: [PATCH 36/72] bump to 3.5.28

(cherry picked from commit 9e6ed88e578abb44329988eb39177191318190a6)
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d03d0be..2ba0e7d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM arm32v6/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 aabc247a2b2d2444c2b36489d7956272a488a681 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Thu, 19 Jul 2018 13:56:03 +0300
Subject: [PATCH 37/72] bump alpine to 3.8

(cherry picked from commit d5cbd68b4d50012238b5ef3dc227d23cad5c5fc8)
---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2ba0e7d..27dd428 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM arm32v6/alpine:3.7 as build
+FROM arm32v6/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 arm32v6/alpine:3.7
+FROM arm32v6/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/

From 2398325ccb56d835f858d88ac52dd1ec83ab4157 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Tue, 21 Aug 2018 14:24:43 +0300
Subject: [PATCH 38/72] revoke "LOCK_UN" fix

(commit 7393b0da870259385a44a70e081ab3276d215427)
---
 Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 97c6819..3a88c7a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -93,8 +93,6 @@ RUN set -x && \
 		--with-openssl \
 		--with-pidfile=/var/run/squid/squid.pid
 
-RUN sed -i -e 's/LOCK_UN/8/g' /tmp/build/src/base/File.h
-
 RUN set -x && \
 	cd /tmp/build && \
 	make -j $(grep -cs ^processor /proc/cpuinfo) && \

From 06757f1033d31b391cc376045b8091c5ecdd6fad Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Tue, 21 Aug 2018 14:25:36 +0300
Subject: [PATCH 39/72] bump to 4.2

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3a88c7a..4eeaa59 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.7 as build
 
-ENV SQUID_VER 4.1
+ENV SQUID_VER 4.2
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
 
 RUN set -x && \

From 7388c631e8e6e8312bb9640dd72a5886947babff Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Tue, 13 Nov 2018 14:37:17 +0300
Subject: [PATCH 40/72] bump to 4.4

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4eeaa59..946136c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.7 as build
 
-ENV SQUID_VER 4.2
+ENV SQUID_VER 4.4
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
 
 RUN set -x && \

From 88a2d623e473bdc25a09e4172ae662f6f189ea91 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Tue, 13 Nov 2018 15:18:24 +0300
Subject: [PATCH 41/72] bump alpine to 3.8

---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 946136c..4fb71bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.7 as build
+FROM alpine:3.8 as build
 
 ENV SQUID_VER 4.4
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
@@ -98,7 +98,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
@@ -111,8 +111,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/

From 34910856c73f0c8349cb03ef4e6b5001706aa1f6 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 6 Feb 2019 10:21:32 +0300
Subject: [PATCH 42/72] bump to 4.5

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4fb71bb..21130db 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.8 as build
 
-ENV SQUID_VER 4.4
+ENV SQUID_VER 4.5
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
 
 RUN set -x && \

From 56930ae938559a8effaa815db056a68e94ea0505 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2019 19:16:54 +0000
Subject: [PATCH 43/72] Bump alpine from 3.8 to 3.9.4

Bumps alpine from 3.8 to 3.9.4.
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 21130db..92d7be2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.8 as build
+FROM alpine:3.9.4 as build
 
 ENV SQUID_VER 4.5
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
@@ -98,7 +98,7 @@ RUN set -x && \
 	make -j $(grep -cs ^processor /proc/cpuinfo) && \
 	make install
 
-FROM alpine:3.8
+FROM alpine:3.9.4
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow

From c057771360f8b5509d57fd580e0a807f449110a0 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Tue, 4 Jun 2019 11:52:49 +0300
Subject: [PATCH 44/72] Dependabot badge

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index cc4f388..dd8ab16 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 [![](https://images.microbadger.com/badges/image/b4tman/squid.svg)](https://microbadger.com/images/b4tman/squid "Get your own image badge on microbadger.com")
+[![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=b4tman/docker-squid)](https://dependabot.com)
 
 # docker-squid
 

From 88f5272b9e3d6c8f7379589f7ea55cdf4bac3554 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Tue, 4 Jun 2019 11:54:44 +0300
Subject: [PATCH 45/72] bump to 4.7

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 92d7be2..de023f1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.9.4 as build
 
-ENV SQUID_VER 4.5
+ENV SQUID_VER 4.7
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
 
 RUN set -x && \

From 127d9c258c5619974f2b6e7834ba52e9e1ac8d0d Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Tue, 4 Jun 2019 12:29:11 +0300
Subject: [PATCH 46/72] add ssl-bump Dockerfile

---
 ssl-bump/Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 ssl-bump/Dockerfile

diff --git a/ssl-bump/Dockerfile b/ssl-bump/Dockerfile
new file mode 100644
index 0000000..3c77751
--- /dev/null
+++ b/ssl-bump/Dockerfile
@@ -0,0 +1,4 @@
+FROM b4tman/squid
+
+USER root
+CMD ["sh", "-c", "(test -d /var/cache/squid/ssl_db || /usr/lib/squid/security_file_certgen -c -s /var/cache/squid/ssl_db -M 4MB) && /usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -z && exec /usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -YCd 1"]
\ No newline at end of file

From d1a9592a3f836ef866da291812e15f2b6da25b75 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2019 02:48:34 +0000
Subject: [PATCH 47/72] Bump alpine from 3.9.4 to 3.10.0

Bumps alpine from 3.9.4 to 3.10.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index de023f1..8bdfeb4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9.4 as build
+FROM alpine:3.10.0 as build
 
 ENV SQUID_VER 4.7
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
@@ -98,7 +98,7 @@ RUN set -x && \
 	make -j $(grep -cs ^processor /proc/cpuinfo) && \
 	make install
 
-FROM alpine:3.9.4
+FROM alpine:3.10.0
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow

From b4622137275e9a15a36a994038662f2ee2d17c19 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 1 Aug 2019 02:54:15 +0000
Subject: [PATCH 48/72] Bump alpine from 3.10.0 to 3.10.1

Bumps alpine from 3.10.0 to 3.10.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8bdfeb4..22e9c9f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.10.0 as build
+FROM alpine:3.10.1 as build
 
 ENV SQUID_VER 4.7
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
@@ -98,7 +98,7 @@ RUN set -x && \
 	make -j $(grep -cs ^processor /proc/cpuinfo) && \
 	make install
 
-FROM alpine:3.10.0
+FROM alpine:3.10.1
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow

From af1abd00399997456f380e523413730accba8b35 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Tue, 6 Aug 2019 12:11:41 +0300
Subject: [PATCH 49/72] add autotest compose file

---
 docker-compose.test.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 docker-compose.test.yml

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
new file mode 100644
index 0000000..7b48686
--- /dev/null
+++ b/docker-compose.test.yml
@@ -0,0 +1,11 @@
+version: '2'
+services:
+  proxy:
+    build: .
+  sut:
+    image: alpine:3.10.1
+    links: 
+      - proxy
+    depends_on:
+      - proxy
+    command: sh -exc "apk add --update curl && sleep 5 && exec curl --proxy http://proxy:3128 -I http://google.com/"

From e513e356c7ee81598b802943a6644ec3b0644e2f Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Tue, 6 Aug 2019 12:26:44 +0300
Subject: [PATCH 50/72] bump to 4.8

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 22e9c9f..c80c8d9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.10.1 as build
 
-ENV SQUID_VER 4.7
+ENV SQUID_VER 4.8
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
 
 RUN set -x && \

From e2bc962b39e1df1506e0fd43b4ce2d73a9101154 Mon Sep 17 00:00:00 2001
From: Dmitry Belyaev <b4tm4n@mail.ru>
Date: Sun, 11 Aug 2019 12:58:17 +0300
Subject: [PATCH 51/72] Append prepend conf.d (#11)

impl #10

* separete conf.d folders

conf.d - for prepend
conf.d.tail - for append
---
 Dockerfile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c80c8d9..3dc0083 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -97,6 +97,9 @@ RUN set -x && \
 	cd /tmp/build && \
 	make -j $(grep -cs ^processor /proc/cpuinfo) && \
 	make install
+
+RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf
+RUN echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf
 
 FROM alpine:3.10.1
 	
@@ -126,9 +129,11 @@ RUN install -d -o squid -g squid \
 		/var/run/squid && \
 	chmod +x /usr/lib/squid/*
 	
-RUN echo 'include /etc/squid/conf.d/*.conf' >> "$SQUID_CONFIG_FILE" && \
-	install -d -m 755 -o squid -g squid /etc/squid/conf.d
-COPY squid-log.conf /etc/squid/conf.d/
+RUN install -d -m 755 -o squid -g squid \
+		/etc/squid/conf.d \
+		/etc/squid/conf.d.tail
+RUN touch /etc/squid/conf.d/placeholder.conf 
+COPY squid-log.conf /etc/squid/conf.d.tail/
 
 RUN	set -x && \
 	apk add --no-cache --virtual .tz alpine-conf tzdata && \ 

From b15fe81ac62e68f6c8c0f90e47377b20f25dc01d Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Sun, 11 Aug 2019 13:03:36 +0300
Subject: [PATCH 52/72] disable cache_log (duplicated to stdout)

---
 squid-log.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/squid-log.conf b/squid-log.conf
index a71be89..039f228 100644
--- a/squid-log.conf
+++ b/squid-log.conf
@@ -1,4 +1,4 @@
 logfile_rotate 0
 cache_store_log none
 access_log stdio:/proc/self/fd/1
-cache_log stdio:/proc/self/fd/2
+cache_log /dev/null

From 9e3ce9a7e4329cb2ef0df55cd1446811ecfbcede Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 1 Sep 2019 02:19:58 +0000
Subject: [PATCH 53/72] Bump alpine from 3.10.1 to 3.10.2

Bumps alpine from 3.10.1 to 3.10.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3dc0083..ae6f171 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.10.1 as build
+FROM alpine:3.10.2 as build
 
 ENV SQUID_VER 4.8
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
@@ -101,7 +101,7 @@ RUN set -x && \
 RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf
 RUN echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf
 
-FROM alpine:3.10.1
+FROM alpine:3.10.2
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow

From bbf973390f6a3214c5f4be2130e5f74f275d552b Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Mon, 2 Sep 2019 11:24:11 +0300
Subject: [PATCH 54/72] add build status

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index dd8ab16..86f80ee 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 [![](https://images.microbadger.com/badges/image/b4tman/squid.svg)](https://microbadger.com/images/b4tman/squid "Get your own image badge on microbadger.com")
 [![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=b4tman/docker-squid)](https://dependabot.com)
+![Docker Build Status](https://img.shields.io/docker/build/b4tman/squid)
 
 # docker-squid
 

From f49f923a2bc1eae11ed0060c599a73fecd18e6bc Mon Sep 17 00:00:00 2001
From: Dmitry Belyaev <b4tm4n@mail.ru>
Date: Wed, 4 Sep 2019 09:38:16 +0300
Subject: [PATCH 55/72] add GitHub Action

Docker Image CI via GitHub Actions
---
 .github/workflows/dockerimage.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 .github/workflows/dockerimage.yml

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
new file mode 100644
index 0000000..709ab29
--- /dev/null
+++ b/.github/workflows/dockerimage.yml
@@ -0,0 +1,23 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches:
+    - master
+    - v3
+    - v4
+  pull_request:
+    branches:
+    - master
+    - v3
+    - v4
+    
+jobs:
+  build: 
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v1
+    - name: Build the Docker image
+      run: docker build . --file Dockerfile --tag b4tman/squid:$(date +%s)
+    - name: Test image
+      run: docker-compose -f docker-compose.test.yml up sut

From 5092f79c0973d2d0e22adc807e7cd491a748427c Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Wed, 4 Sep 2019 11:08:05 +0300
Subject: [PATCH 56/72] add Docker Image CI badge

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 86f80ee..7ae3467 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 [![](https://images.microbadger.com/badges/image/b4tman/squid.svg)](https://microbadger.com/images/b4tman/squid "Get your own image badge on microbadger.com")
 [![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=b4tman/docker-squid)](https://dependabot.com)
-![Docker Build Status](https://img.shields.io/docker/build/b4tman/squid)
+![Docker Build Status](https://img.shields.io/docker/build/b4tman/squid)
+![Docker Image CI Status](https://github.com/b4tman/docker-squid/workflows/Docker%20Image%20CI/badge.svg)
 
 # docker-squid
 

From 8394735252c6ebd7b032a5edb3355706557ad52b Mon Sep 17 00:00:00 2001
From: Dmitry Belyaev <b4tm4n@mail.ru>
Date: Tue, 24 Sep 2019 15:46:08 +0300
Subject: [PATCH 57/72] push to GitHub Package Registry (#15)

* push docker image to GitHub

* fix yaml
---
 .github/workflows/dockerimage.yml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 709ab29..eb1a438 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -18,6 +18,26 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag b4tman/squid:$(date +%s)
+      run: docker build . --file Dockerfile --tag b4tman/squid
     - name: Test image
       run: docker-compose -f docker-compose.test.yml up sut
+    - name: Build 'ssl-bump' Docker image
+      run: docker build ssl-bump --tag b4tman/squid:ssl-bump
+    - name: GituHub Packages - Docker Login
+      if:  github.event_name == 'push'
+      run: docker login docker.pkg.github.com -u ${{secrets.GITHUB_PKGS_LOGIN}} -p ${{secrets.GITHUB_PKGS_TOKEN}}
+    - name: GituHub Packages - Docker Tag
+      if:  github.event_name == 'push'
+      run: docker tag b4tman/squid docker.pkg.github.com/${{github.repository}}/squid:$(echo ${{github.ref}} | sed 's/.*\/.*\///')
+    - name: GituHub Packages - Docker Tag 'ssl-bump'
+      if:  github.event_name == 'push'
+      run: docker tag b4tman/squid:ssl-bump docker.pkg.github.com/${{github.repository}}/ssl-bump:$(echo ${{github.ref}} | sed 's/.*\/.*\///')
+    - name: GituHub Packages - Docker Push
+      if:  github.event_name == 'push'
+      run: docker push b4tman/squid docker.pkg.github.com/${{github.repository}}/squid:$(echo ${{github.ref}} | sed 's/.*\/.*\///')
+    - name: GituHub Packages - Docker Push 'ssl-bump'
+      if:  github.event_name == 'push'
+      run: docker push b4tman/squid docker.pkg.github.com/${{github.repository}}/ssl-bump:$(echo ${{github.ref}} | sed 's/.*\/.*\///')
+    - name: GituHub Packages - Docker Logout
+      if:  github.event_name == 'push'
+      run: docker logout docker.pkg.github.com

From a9785a47bcae12034f349579d3873ef39628f696 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Tue, 24 Sep 2019 16:07:16 +0300
Subject: [PATCH 58/72] fix 'docker push'

---
 .github/workflows/dockerimage.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index eb1a438..adb220d 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -34,10 +34,10 @@ jobs:
       run: docker tag b4tman/squid:ssl-bump docker.pkg.github.com/${{github.repository}}/ssl-bump:$(echo ${{github.ref}} | sed 's/.*\/.*\///')
     - name: GituHub Packages - Docker Push
       if:  github.event_name == 'push'
-      run: docker push b4tman/squid docker.pkg.github.com/${{github.repository}}/squid:$(echo ${{github.ref}} | sed 's/.*\/.*\///')
+      run: docker push docker.pkg.github.com/${{github.repository}}/squid:$(echo ${{github.ref}} | sed 's/.*\/.*\///')
     - name: GituHub Packages - Docker Push 'ssl-bump'
       if:  github.event_name == 'push'
-      run: docker push b4tman/squid docker.pkg.github.com/${{github.repository}}/ssl-bump:$(echo ${{github.ref}} | sed 's/.*\/.*\///')
+      run: docker push docker.pkg.github.com/${{github.repository}}/ssl-bump:$(echo ${{github.ref}} | sed 's/.*\/.*\///')
     - name: GituHub Packages - Docker Logout
       if:  github.event_name == 'push'
       run: docker logout docker.pkg.github.com

From 63fcfbd66f78269ffaa74ddb335284cbb4d68bc2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2019 03:03:03 +0000
Subject: [PATCH 59/72] Bump alpine from 3.10.2 to 3.10.3

Bumps alpine from 3.10.2 to 3.10.3.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ae6f171..7782f08 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.10.2 as build
+FROM alpine:3.10.3 as build
 
 ENV SQUID_VER 4.8
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
@@ -101,7 +101,7 @@ RUN set -x && \
 RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf
 RUN echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf
 
-FROM alpine:3.10.2
+FROM alpine:3.10.3
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow

From 6b9adeb25a1f593923bd91c69cf71fa9c052ec6a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 1 Jan 2020 15:46:07 +0300
Subject: [PATCH 60/72] Bump alpine from 3.10.3 to 3.11.2 (#17)

* Bump alpine from 3.10.3 to 3.11.2

Bumps alpine from 3.10.3 to 3.11.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* libressl 3.0

Co-authored-by: Dmitry Belyaev <b4tman@ya.ru>
---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7782f08..c9c5ed7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.10.3 as build
+FROM alpine:3.11.2 as build
 
 ENV SQUID_VER 4.8
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
@@ -101,7 +101,7 @@ RUN set -x && \
 RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf
 RUN echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf
 
-FROM alpine:3.10.3
+FROM alpine:3.11.2
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow
@@ -114,8 +114,8 @@ RUN apk add --no-cache \
 		libstdc++ \
 		heimdal-libs \
 		libcap \
-		libressl2.7-libcrypto \
-		libressl2.7-libssl \
+		libressl3.0-libcrypto \
+		libressl3.0-libssl \
 		libltdl	
 
 COPY --from=build /etc/squid/ /etc/squid/

From 4e7b30df68b21a52fbb04f31a5597422b5316f81 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Sat, 11 Jan 2020 20:21:25 +0300
Subject: [PATCH 61/72] bump to 4.9

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c9c5ed7..3395957 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.11.2 as build
 
-ENV SQUID_VER 4.8
+ENV SQUID_VER 4.9
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
 
 RUN set -x && \

From 483a6c83de14dedd149b28403ebf550e6cf85a29 Mon Sep 17 00:00:00 2001
From: Dmitry Belyaev <b4tm4n@mail.ru>
Date: Thu, 30 Jan 2020 08:52:44 +0300
Subject: [PATCH 62/72] bump to 4.10

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3395957..a712143 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.11.2 as build
 
-ENV SQUID_VER 4.9
+ENV SQUID_VER 4.10
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
 
 RUN set -x && \

From cf301af570149e168e5198e1dad3b281ff4fef84 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 1 Feb 2020 02:37:07 +0000
Subject: [PATCH 63/72] Bump alpine from 3.11.2 to 3.11.3

Bumps alpine from 3.11.2 to 3.11.3.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a712143..e0f5a04 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11.2 as build
+FROM alpine:3.11.3 as build
 
 ENV SQUID_VER 4.10
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
@@ -101,7 +101,7 @@ RUN set -x && \
 RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf
 RUN echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf
 
-FROM alpine:3.11.2
+FROM alpine:3.11.3
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow

From 0ca618e4a0367d2217bed7cb3fde87606aa8713a Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Sun, 2 Feb 2020 18:09:50 +0300
Subject: [PATCH 64/72] remove GITHUB_PKGS_LOGIN from secrets

---
 .github/workflows/dockerimage.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index adb220d..9684e83 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -25,7 +25,7 @@ jobs:
       run: docker build ssl-bump --tag b4tman/squid:ssl-bump
     - name: GituHub Packages - Docker Login
       if:  github.event_name == 'push'
-      run: docker login docker.pkg.github.com -u ${{secrets.GITHUB_PKGS_LOGIN}} -p ${{secrets.GITHUB_PKGS_TOKEN}}
+      run: docker login docker.pkg.github.com -u b4tman -p ${{secrets.GITHUB_PKGS_TOKEN}}
     - name: GituHub Packages - Docker Tag
       if:  github.event_name == 'push'
       run: docker tag b4tman/squid docker.pkg.github.com/${{github.repository}}/squid:$(echo ${{github.ref}} | sed 's/.*\/.*\///')

From a3b428e958a7b1ba61cd8702c8e93d1244c14e50 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Sun, 2 Feb 2020 18:51:35 +0300
Subject: [PATCH 65/72] rewrite dockerimage workflow

---
 .github/workflows/dockerimage.yml | 100 +++++++++++++++++++++---------
 1 file changed, 70 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 9684e83..3845504 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -2,42 +2,82 @@ name: Docker Image CI
 
 on:
   push:
+    # Publish `master` as Docker `latest` image.
     branches:
-    - master
-    - v3
-    - v4
-  pull_request:
-    branches:
-    - master
-    - v3
-    - v4
+      - master
     
+    # Publish `v1.2.3` tags as releases.
+    tags:
+      - v*
+  
+  # Run tests for any PRs.
+  pull_request:
+  
 jobs:
-  build: 
+  test: 
     runs-on: ubuntu-18.04
     steps:
-    - uses: actions/checkout@v1
-    - name: Build the Docker image
+    - uses: actions/checkout@v2
+    
+    - name: Build squid image
       run: docker build . --file Dockerfile --tag b4tman/squid
+    
     - name: Test image
       run: docker-compose -f docker-compose.test.yml up sut
-    - name: Build 'ssl-bump' Docker image
+    
+    - name: Build 'ssl-bump' image
       run: docker build ssl-bump --tag b4tman/squid:ssl-bump
-    - name: GituHub Packages - Docker Login
-      if:  github.event_name == 'push'
-      run: docker login docker.pkg.github.com -u b4tman -p ${{secrets.GITHUB_PKGS_TOKEN}}
-    - name: GituHub Packages - Docker Tag
-      if:  github.event_name == 'push'
-      run: docker tag b4tman/squid docker.pkg.github.com/${{github.repository}}/squid:$(echo ${{github.ref}} | sed 's/.*\/.*\///')
-    - name: GituHub Packages - Docker Tag 'ssl-bump'
-      if:  github.event_name == 'push'
-      run: docker tag b4tman/squid:ssl-bump docker.pkg.github.com/${{github.repository}}/ssl-bump:$(echo ${{github.ref}} | sed 's/.*\/.*\///')
-    - name: GituHub Packages - Docker Push
-      if:  github.event_name == 'push'
-      run: docker push docker.pkg.github.com/${{github.repository}}/squid:$(echo ${{github.ref}} | sed 's/.*\/.*\///')
-    - name: GituHub Packages - Docker Push 'ssl-bump'
-      if:  github.event_name == 'push'
-      run: docker push docker.pkg.github.com/${{github.repository}}/ssl-bump:$(echo ${{github.ref}} | sed 's/.*\/.*\///')
-    - name: GituHub Packages - Docker Logout
-      if:  github.event_name == 'push'
-      run: docker logout docker.pkg.github.com
+  
+  push:
+    needs: test
+    runs-on: ubuntu-18.04
+    if: github.event_name == 'push'
+    
+    - uses: actions/checkout@v2
+    
+    - name: Build squid image
+      run: docker build . --file Dockerfile --tag b4tman/squid
+    
+    - name: Build 'ssl-bump' image
+      run: docker build ssl-bump --tag b4tman/squid:ssl-bump
+    
+    - name: Log into registry
+      run: echo "${{ secrets.GITHUB_PKGS_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
+    
+    - name: Push squid image
+      run: |
+        IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/squid
+      
+        # Strip git ref prefix from version
+        VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+      
+        # Strip "v" prefix from tag name
+        [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+      
+        # Use Docker `latest` tag convention
+        [ "$VERSION" == "master" ] && VERSION=latest
+      
+        echo IMAGE_ID=$IMAGE_ID
+        echo VERSION=$VERSION
+      
+        docker tag b4tman/squid $IMAGE_ID:$VERSION
+        docker push $IMAGE_ID:$VERSION
+    
+    - name: Push 'ssl-bump' image
+      run: |
+        IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/ssl-bump
+      
+        # Strip git ref prefix from version
+        VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+      
+        # Strip "v" prefix from tag name
+        [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+      
+        # Use Docker `latest` tag convention
+        [ "$VERSION" == "master" ] && VERSION=latest
+      
+        echo IMAGE_ID=$IMAGE_ID
+        echo VERSION=$VERSION
+      
+        docker tag b4tman/squid:ssl-bump $IMAGE_ID:$VERSION
+        docker push $IMAGE_ID:$VERSION

From f709ee39b40ff89c41c7e0c0a98b44a98e5340af Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Sun, 2 Feb 2020 18:55:25 +0300
Subject: [PATCH 66/72] fix dockerimage workflow

---
 .github/workflows/dockerimage.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 3845504..719d057 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -32,7 +32,7 @@ jobs:
     needs: test
     runs-on: ubuntu-18.04
     if: github.event_name == 'push'
-    
+    steps:
     - uses: actions/checkout@v2
     
     - name: Build squid image

From 74a4ac3993cc22024a2e3d3459aad1f7453749e2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 1 Apr 2020 02:56:48 +0000
Subject: [PATCH 67/72] Bump alpine from 3.11.3 to 3.11.5

Bumps alpine from 3.11.3 to 3.11.5.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e0f5a04..c536278 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11.3 as build
+FROM alpine:3.11.5 as build
 
 ENV SQUID_VER 4.10
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
@@ -101,7 +101,7 @@ RUN set -x && \
 RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf
 RUN echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf
 
-FROM alpine:3.11.3
+FROM alpine:3.11.5
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow

From 72ef256dfe278ab2dbd65550831dba8e39924383 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 May 2020 02:44:24 +0000
Subject: [PATCH 68/72] Bump alpine from 3.11.5 to 3.11.6

Bumps alpine from 3.11.5 to 3.11.6.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c536278..a8cb4e2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11.5 as build
+FROM alpine:3.11.6 as build
 
 ENV SQUID_VER 4.10
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
@@ -101,7 +101,7 @@ RUN set -x && \
 RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf
 RUN echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf
 
-FROM alpine:3.11.5
+FROM alpine:3.11.6
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow

From 15cf0f1674dc50f416f99883a539ce7025c0f549 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Jun 2020 03:01:10 +0000
Subject: [PATCH 69/72] Bump alpine from 3.11.6 to 3.12.0

Bumps alpine from 3.11.6 to 3.12.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a8cb4e2..37ebd2d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11.6 as build
+FROM alpine:3.12.0 as build
 
 ENV SQUID_VER 4.10
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
@@ -101,7 +101,7 @@ RUN set -x && \
 RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf
 RUN echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf
 
-FROM alpine:3.11.6
+FROM alpine:3.12.0
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow

From 70ac196b8610b5e3d4eee9c4b6c1b385bfa7f186 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Mon, 1 Jun 2020 11:05:28 +0300
Subject: [PATCH 70/72] libressl 3.1

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 37ebd2d..480f611 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -114,8 +114,8 @@ RUN apk add --no-cache \
 		libstdc++ \
 		heimdal-libs \
 		libcap \
-		libressl3.0-libcrypto \
-		libressl3.0-libssl \
+		libressl3.1-libcrypto \
+		libressl3.1-libssl \
 		libltdl	
 
 COPY --from=build /etc/squid/ /etc/squid/

From d1e2082f73a3576f176b9b5a74c502ca7ccd86e1 Mon Sep 17 00:00:00 2001
From: Dmitry Belyaev <b4tm4n@mail.ru>
Date: Mon, 15 Jun 2020 13:48:18 +0300
Subject: [PATCH 71/72] bump to 4.12

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 480f611..b31497b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.12.0 as build
 
-ENV SQUID_VER 4.10
+ENV SQUID_VER 4.12
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
 
 RUN set -x && \

From a6b68820a9a430f91f7185ef48577985d68e0d32 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2020 07:14:46 +0000
Subject: [PATCH 72/72] Create Dependabot config file

---
 .github/dependabot.yml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..61d011e
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: docker
+  directory: "/"
+  schedule:
+    interval: monthly
+    time: '02:00'
+  open-pull-requests-limit: 10