From ab6974f7b7327116d7b71d626fc93ee115fdfb36 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 2 Feb 2020 19:26:12 +0300 Subject: [PATCH 1/4] bump squid to 5.0.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e0f5a04..7ec6079 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11.3 as build -ENV SQUID_VER 4.10 +ENV SQUID_VER 5.0.1 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E RUN set -x && \ From 9d7abf3deada5f0617586b44147be3f5c9e40c9e Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 10 Aug 2021 10:41:20 +0300 Subject: [PATCH 2/4] bump to 5.0.7 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2152807..1769479 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14.0 as build -ENV SQUID_VER 5.0.1 +ENV SQUID_VER 5.0.7 # fix conflict with libretls and libressl RUN set -x && \ From 1075790c45e132ce6289a774bfc6bc3b92d068d7 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 10 Aug 2021 11:28:21 +0300 Subject: [PATCH 3/4] fix build dirs --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1769479..3b518bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -94,7 +94,11 @@ RUN set -x && \ --with-default-user=squid \ --with-openssl \ --with-pidfile=/var/run/squid/squid.pid - + +# fix build +RUN set -x && \ + mkdir -p /tmp/build/tools/squidclient/tests && \ + mkdir -p /tmp/build/tools/tests RUN set -x && \ cd /tmp/build && \ From 685eeddf3ec9bb1451d596cc0b0e44b5de19faa1 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 10 Aug 2021 11:28:57 +0300 Subject: [PATCH 4/4] bump squid to 5.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3b518bf..8b8b94f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.14.0 as build -ENV SQUID_VER 5.0.7 +ENV SQUID_VER 5.1 # fix conflict with libretls and libressl RUN set -x && \