Merge branch 'master' into v6

# Conflicts: # .github/workflows/dockerimage.yml
fix ci branches
2024-10-22 22:15:05 +00:00 · 2023-07-06 16:19:05 +03:00 · 2023-07-06 16:17:53 +03:00 · 2023-07-06 16:05:22 +03:00 · 2023-07-06 16:05:22 +03:00 · 2023-07-06 16:05:22 +03:00
2 changed files with 5 additions and 5 deletions
--- 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:
--- a/6
+++ b/6
@ -1,6 +1,6 @@
-FROM alpine:3.18.0 as build
+FROM alpine:3.18.2 as build

-ARG SQUID_VER=6.0.3
+ARG SQUID_VER=6.1

 RUN set -x && \
 	apk add --no-cache  \
@ -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
Author	SHA1	Message	Date
Dmitry	52cf315925	Merge branch 'master' into v6 # Conflicts: # .github/workflows/dockerimage.yml	2023-07-06 16:19:05 +03:00
Dmitry	e7d7016018	fix ci branches [skip ci]	2023-07-06 16:17:53 +03:00
Dmitry	a89c6b2878	bump squid to 6.1	2023-07-06 16:05:22 +03:00
Dmitry	9f260deb7f	bump squid to 6.0.3	2023-07-06 16:05:22 +03:00
Dmitry	94cc9e2244	push v6 images	2023-07-06 16:05:22 +03:00
Dmitry	83cd331a0b	bump squid to 6.0.2	2023-07-06 16:05:22 +03:00
Dmitry	9b841befe5	bump squid to 6.1	2023-07-06 14:09:54 +03:00
dependabot[bot]	1e0e16e157	Bump alpine from 3.18.0 to 3.18.2 Bumps alpine from 3.18.0 to 3.18.2. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-07-01 11:36:07 +03:00