From 1e0e16e157475562f7436e1ae30f3a8461ecfecd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 02:43:56 +0000
Subject: [PATCH 1/6] 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>
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8bd405f..bd424da 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=5.9
 
@@ -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

From 83cd331a0bd206cc494b35be7a20916735541f5a Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Tue, 2 May 2023 15:53:55 +0300
Subject: [PATCH 2/6] bump squid to 6.0.2

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index bd424da..16d0fa8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.18.2 as build
 
-ARG SQUID_VER=5.9
+ARG SQUID_VER=6.0.2
 
 RUN set -x && \
 	apk add --no-cache  \

From 94cc9e224427ab85c13f3a5b81dada6802fc1b20 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Tue, 2 May 2023 17:11:44 +0300
Subject: [PATCH 3/6] push v6 images

---
 .github/workflows/dockerimage.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index f302789..a0d9550 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -4,7 +4,8 @@ on:
   push:
     # Publish `master` as Docker `latest` image.
     branches:
-      - master
+      - master
+      - v6
 
     # Publish `v1.2.3` tags as releases.
     tags:

From 9f260deb7f143fa539b38711e99173cfeb926ef6 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Tue, 13 Jun 2023 14:12:11 +0300
Subject: [PATCH 4/6] bump squid to 6.0.3

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 16d0fa8..38cdc0d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.18.2 as build
 
-ARG SQUID_VER=6.0.2
+ARG SQUID_VER=6.0.3
 
 RUN set -x && \
 	apk add --no-cache  \

From a89c6b287861353c6ffd9f79f486ca003971a812 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Thu, 6 Jul 2023 14:09:54 +0300
Subject: [PATCH 5/6] bump squid to 6.1

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 38cdc0d..b161dda 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 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  \

From e7d7016018ecbfb4a394b5b506d42826c12b8202 Mon Sep 17 00:00:00 2001
From: Dmitry <b4tm4n@mail.ru>
Date: Thu, 6 Jul 2023 16:17:53 +0300
Subject: [PATCH 6/6] fix ci branches

[skip ci]
---
 .github/workflows/dockerimage.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index a0d9550..394d660 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -5,7 +5,7 @@ on:
     # Publish `master` as Docker `latest` image.
     branches:
       - master
-      - v6
+      - v5
 
     # Publish `v1.2.3` tags as releases.
     tags: