1
0
mirror of https://github.com/b4tman/docker-squid.git synced 2024-11-23 03:36:54 +00:00

bump alpine to 3.7

(cherry picked from commit 6996f4b15d)
This commit is contained in:
Dmitry Belyaev 2018-02-28 13:09:53 +03:00
parent 158d177c51
commit f37e4a4dfd
Signed by: b4tman
GPG Key ID: 014E87EC54B77673

View File

@ -1,4 +1,4 @@
FROM b4tman/armhf-alpine-qemu:3.6 as build FROM b4tman/armhf-alpine-qemu:3.7 as build
MAINTAINER b4tman <b4tm4n@mail.ru> MAINTAINER b4tman <b4tm4n@mail.ru>
ENV SQUID_VER 3.5.27 ENV SQUID_VER 3.5.27
@ -98,7 +98,7 @@ RUN set -x && \
RUN [ "cross-build-end" ] RUN [ "cross-build-end" ]
FROM arm32v6/alpine:3.6 FROM arm32v6/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/