mirror of
https://github.com/b4tman/docker-squid.git
synced 2024-11-22 11:16:55 +00:00
Bump alpine from 3.10.3 to 3.11.2 (#17)
* Bump alpine from 3.10.3 to 3.11.2 Bumps alpine from 3.10.3 to 3.11.2. Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * libressl 3.0 Co-authored-by: Dmitry Belyaev <b4tman@ya.ru>
This commit is contained in:
parent
63fcfbd66f
commit
6b9adeb25a
@ -1,4 +1,4 @@
|
|||||||
FROM alpine:3.10.3 as build
|
FROM alpine:3.11.2 as build
|
||||||
|
|
||||||
ENV SQUID_VER 4.8
|
ENV SQUID_VER 4.8
|
||||||
ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
|
ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
|
||||||
@ -101,7 +101,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.10.3
|
FROM alpine:3.11.2
|
||||||
|
|
||||||
ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
|
ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
|
||||||
ENV TZ Europe/Moscow
|
ENV TZ Europe/Moscow
|
||||||
@ -114,8 +114,8 @@ RUN apk add --no-cache \
|
|||||||
libstdc++ \
|
libstdc++ \
|
||||||
heimdal-libs \
|
heimdal-libs \
|
||||||
libcap \
|
libcap \
|
||||||
libressl2.7-libcrypto \
|
libressl3.0-libcrypto \
|
||||||
libressl2.7-libssl \
|
libressl3.0-libssl \
|
||||||
libltdl
|
libltdl
|
||||||
|
|
||||||
COPY --from=build /etc/squid/ /etc/squid/
|
COPY --from=build /etc/squid/ /etc/squid/
|
||||||
|
Loading…
Reference in New Issue
Block a user