Skip to content

Commit

Permalink
Merge branch 'master' into v6
Browse files Browse the repository at this point in the history
  • Loading branch information
b4tman committed Jun 13, 2023
2 parents 09aba63 + 6b980db commit 17fb8d5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17.3 as build
FROM alpine:3.18.0 as build

ARG SQUID_VER=6.0.2

Expand Down Expand Up @@ -58,7 +58,7 @@ RUN set -x && \
--disable-arch-native \
--enable-removal-policies="lru,heap" \
--enable-auth-digest \
--enable-auth-basic="getpwnam,NCSA,DB" \
--enable-auth-basic="getpwnam,NCSA,DB,RADIUS" \
--enable-basic-auth-helpers="DB" \
--enable-epoll \
--enable-external-acl-helpers="file_userip,unix_group,wbinfo_group" \
Expand Down Expand Up @@ -106,7 +106,7 @@ RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf && \

# --- --- --- --- --- --- --- --- ---

FROM alpine:3.17.3
FROM alpine:3.18.0

ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
ENV TZ Europe/Moscow
Expand Down

0 comments on commit 17fb8d5

Please sign in to comment.