diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index a0d9550..1784aa2 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -4,8 +4,8 @@ on: push: # Publish `master` as Docker `latest` image. branches: - - master - - v6 + - master + - v5 # Publish `v1.2.3` tags as releases. tags: diff --git a/Dockerfile b/Dockerfile index c0b149f..b161dda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18.0 as build +FROM alpine:3.18.2 as build ARG SQUID_VER=6.1 @@ -106,7 +106,7 @@ RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf && \ # --- --- --- --- --- --- --- --- --- -FROM alpine:3.18.0 +FROM alpine:3.18.2 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf ENV TZ Europe/Moscow