1
0
mirror of https://github.com/b4tman/docker-squid.git synced 2025-07-24 21:33:28 +00:00

bump alpine to 3.7

(cherry picked from commit 6996f4b15d)
This commit is contained in:
2018-02-28 12:29:52 +03:00
parent 6c614c0f90
commit 9b081c8cec

@@ -1,4 +1,4 @@
FROM alpine:3.6 as build FROM alpine:3.7 as build
ENV SQUID_VER 4.0.21 ENV SQUID_VER 4.0.21
ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
@@ -100,7 +100,7 @@ RUN set -x && \
make -j $(grep -cs ^processor /proc/cpuinfo) && \ make -j $(grep -cs ^processor /proc/cpuinfo) && \
make install make install
FROM alpine:3.6 FROM alpine:3.7
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,8 +113,8 @@ RUN apk add --no-cache \
libstdc++ \ libstdc++ \
heimdal-libs \ heimdal-libs \
libcap \ libcap \
libressl2.5-libcrypto \ libressl2.6-libcrypto \
libressl2.5-libssl \ libressl2.6-libssl \
libltdl libltdl
COPY --from=build /etc/squid/ /etc/squid/ COPY --from=build /etc/squid/ /etc/squid/