From dec82cdebd634cfa245bc829105781c67855f352 Mon Sep 17 00:00:00 2001
From: Fred <numsys@free.fr>
Date: Thu, 24 Aug 2023 13:49:28 +0000
Subject: [PATCH] Update 4 files

- /Dockerfile
- /.gitlab-ci.yml
- /gitlabci/docker-hub.yml
- /gitlabci/docker-hub-arm.yml
---
 .gitlab-ci.yml              | 2 --
 Dockerfile                  | 2 +-
 gitlabci/docker-hub-arm.yml | 4 ++--
 gitlabci/docker-hub.yml     | 4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cad1713..bd61d11 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,8 +23,6 @@ include:
   - 'gitlabci/docker-hub-arm.yml'
   - template: Security/SAST-IaC.latest.gitlab-ci.yml
 
-
-
 hadolint:
   image: hadolint/hadolint:latest-debian
   stage: quality
diff --git a/Dockerfile b/Dockerfile
index 03f155c..0f40067 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ ARG SQUID_VERSION
 ENV ENV_SQUID_VERSION=$SQUID_VERSION
 WORKDIR /tmp
 RUN echo "deb-src http://deb.debian.org/debian bookworm main contrib" >> /etc/apt/sources.list && apt-get update && apt-get --no-upgrade --no-install-recommends -y build-dep squid && apt-get --no-install-recommends -y install wget tar xz-utils libssl-dev libssl3 winbind \
-    && wget --progress=dot:giga http://www.squid-cache.org/Versions/v5/$SQUID_VERSION \
+    && wget --progress=dot:giga http://www.squid-cache.org/Versions/v6/$SQUID_VERSION \
     && tar -C /tmp --strip-components=1 -xzf $SQUID_VERSION \
     && ./configure \
         --prefix=/usr \
diff --git a/gitlabci/docker-hub-arm.yml b/gitlabci/docker-hub-arm.yml
index 66a721c..1a04b95 100644
--- a/gitlabci/docker-hub-arm.yml
+++ b/gitlabci/docker-hub-arm.yml
@@ -17,7 +17,7 @@ docker-hub-build-arm:
   script:
     - cd $CI_PROJECT_DIR
     - apk add --no-cache curl
-    - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v5/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1)
+    - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v6/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1)
     - docker build -f Dockerfile --build-arg SQUID_VERSION=$SQUID_VERSION --pull -t $CONTAINER_BUILD_NOPROD_NAME_ARM .
     - docker push $CONTAINER_BUILD_NOPROD_NAME_ARM
 
@@ -63,7 +63,7 @@ push-docker-hub-arm:
   script:
     - apk add --no-cache curl
     - docker pull $CONTAINER_BUILD_NOPROD_NAME_ARM
-    - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v5/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1 | sed 's/\.tar\.gz//g')
+    - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v6/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1 | sed 's/\.tar\.gz//g')
     - docker tag $CONTAINER_BUILD_NOPROD_NAME_ARM $HUB_REGISTRY_IMAGE:$SQUID_VERSION-arm 
     - docker push $HUB_REGISTRY_IMAGE:$SQUID_VERSION-arm
     - docker tag $CONTAINER_BUILD_NOPROD_NAME_ARM $HUB_REGISTRY_IMAGE:latest-arm 
diff --git a/gitlabci/docker-hub.yml b/gitlabci/docker-hub.yml
index c543c36..7bdce7a 100644
--- a/gitlabci/docker-hub.yml
+++ b/gitlabci/docker-hub.yml
@@ -15,7 +15,7 @@ docker-hub-build:
   script:
     - cd $CI_PROJECT_DIR
     - apk add --no-cache curl
-    - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v5/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1)
+    - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v6/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1)
     - docker build --build-arg SQUID_VERSION=$SQUID_VERSION --pull -t $CONTAINER_BUILD_NOPROD_NAME_AMD64 .
     - docker push $CONTAINER_BUILD_NOPROD_NAME_AMD64
 
@@ -70,7 +70,7 @@ push-docker-hub:
   script:
     - apk add --no-cache curl
     - docker pull $CONTAINER_BUILD_NOPROD_NAME_AMD64
-    - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v5/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1 | sed 's/\.tar\.gz//g')
+    - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v6/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1 | sed 's/\.tar\.gz//g')
     - docker tag $CONTAINER_BUILD_NOPROD_NAME_AMD64 $HUB_REGISTRY_IMAGE:$SQUID_VERSION-amd64 
     - docker push $HUB_REGISTRY_IMAGE:$SQUID_VERSION-amd64
     - docker tag $CONTAINER_BUILD_NOPROD_NAME_AMD64 $HUB_REGISTRY_IMAGE:latest-amd64