diff --git a/Dockerfile b/Dockerfile index b8ade31..9758f58 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,11 @@ -FROM alpine:3.13.5 as build +FROM alpine:3.14.0 as build ENV SQUID_VER 4.15 -ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E + +# fix conflict with libretls and libressl +RUN set -x && \ + apk add --no-cache libretls && \ + apk upgrade --no-cache libretls RUN set -x && \ apk add --no-cache \ @@ -26,15 +30,13 @@ RUN set -x && \ 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 - + +COPY squid-keys.asc /tmp + RUN set -x && \ cd /tmp/build && \ export GNUPGHOME="$(mktemp -d)" && \ - ( \ - 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 --import /tmp/squid-keys.asc && \ gpg --batch --verify squid-${SQUID_VER}.tar.gz.asc squid-${SQUID_VER}.tar.gz && \ rm -rf "$GNUPGHOME" @@ -104,7 +106,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.13.5 +FROM alpine:3.14.0 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf ENV TZ Europe/Moscow @@ -113,12 +115,17 @@ 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 +# fix conflict with libretls and libressl +RUN set -x && \ + apk add --no-cache libretls && \ + apk upgrade --no-cache libretls + RUN apk add --no-cache \ libstdc++ \ heimdal-libs \ libcap \ - libressl3.1-libcrypto \ - libressl3.1-libssl \ + libressl3.3-libcrypto \ + libressl3.3-libssl \ libltdl COPY --from=build /etc/squid/ /etc/squid/ diff --git a/squid-keys.asc b/squid-keys.asc new file mode 100644 index 0000000..2f74573 Binary files /dev/null and b/squid-keys.asc differ