b4tman/docker-squid
1
0
Fork 0
mirror of https://github.com/b4tman/docker-squid.git synced 2024-11-22 19:26:54 +00:00
Code Issues Packages Releases Activity

Merge branch 'master' into v6

Browse Source 
# Conflicts:
#	.github/workflows/dockerimage.yml
This commit is contained in:
Dmitry Belyaev 2023-07-06 16:19:05 +03:00
commit 52cf315925
Signed by: b4tman
GPG Key ID: 41A00BF15EA7E5F3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/dockerimage.yml vendored
View File

@ -4,8 +4,8 @@ on:
push: push:
# Publish `master` as Docker `latest` image. # Publish `master` as Docker `latest` image.
branches: branches:
- master - master
- v6 - v5
# Publish `v1.2.3` tags as releases. # Publish `v1.2.3` tags as releases.
tags: tags:

4
Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.18.0 as build FROM alpine:3.18.2 as build
ARG SQUID_VER=6.1 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 SQUID_CONFIG_FILE /etc/squid/squid.conf
ENV TZ Europe/Moscow ENV TZ Europe/Moscow