b4tman/docker-squid
1
0
Fork 0
mirror of https://github.com/b4tman/docker-squid.git synced 2024-11-26 05:06:54 +00:00
Code Issues Packages Releases Activity

Merge pull request #45 from b4tman/dependabot/docker/alpine-3.14.0

Browse Source 
Bump alpine from 3.13.5 to 3.14.0
This commit is contained in:
Dmitry Belyaev 2021-07-01 14:55:32 +03:00 committed by GitHub
commit b68f62c04c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Dockerfile
View File

@ -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_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 && \ RUN set -x && \
apk add --no-cache \ apk add --no-cache \
@ -27,14 +31,12 @@ RUN set -x && \
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 -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.asc -o squid-${SQUID_VER}.tar.gz.asc
COPY squid-keys.asc /tmp
RUN set -x && \ RUN set -x && \
cd /tmp/build && \ cd /tmp/build && \
export GNUPGHOME="$(mktemp -d)" && \ export GNUPGHOME="$(mktemp -d)" && \
( \ gpg --import /tmp/squid-keys.asc && \
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 && \ gpg --batch --verify squid-${SQUID_VER}.tar.gz.asc squid-${SQUID_VER}.tar.gz && \
rm -rf "$GNUPGHOME" 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 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 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 SQUID_CONFIG_FILE /etc/squid/squid.conf
ENV TZ Europe/Moscow ENV TZ Europe/Moscow
@ -113,12 +115,17 @@ RUN set -x && \
deluser squid 2>/dev/null; delgroup squid 2>/dev/null; \ 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 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 \ RUN apk add --no-cache \
libstdc++ \ libstdc++ \
heimdal-libs \ heimdal-libs \
libcap \ libcap \
libressl3.1-libcrypto \ libressl3.3-libcrypto \
libressl3.1-libssl \ libressl3.3-libssl \
libltdl libltdl
COPY --from=build /etc/squid/ /etc/squid/ COPY --from=build /etc/squid/ /etc/squid/

BIN
squid-keys.asc Normal file
View File

Binary file not shown.