From df2c84a2de68304ddfb05b59368f707e9e06de1c Mon Sep 17 00:00:00 2001
From: fredbcode <numsys@free.fr>
Date: Tue, 2 Nov 2021 11:35:47 +0100
Subject: [PATCH] Add dumb-init for pid 1

---
 Dockerfile                  | 5 +++--
 gitlabci/docker-hub-arm.yml | 2 +-
 gitlabci/docker-hub.yml     | 2 +-
 run.sh                      | 5 +----
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ebd2334..11ffd10 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -100,7 +100,7 @@ RUN adduser --no-create-home --uid 1161 --group --system squid \
     && echo "cache_log /var/log/squid/cache.log" >> /etc/squid/squid.conf \
     && echo "cache_effective_user squid" >> /etc/squid/squid.conf \
 # Packages dependencies installation for running and clean again 
-    && apt-get update && apt-get install -y --no-install-recommends ca-certificates net-tools rsync libexpat1 libltdl7 libxml2 openssl ca-certificates libldap-2.4-2 libecap3 libcap2 libdb5.3 libatomic1 \
+    && apt-get update && apt-get install -y --no-install-recommends ca-certificates net-tools rsync libexpat1 libltdl7 libxml2 openssl ca-certificates libldap-2.4-2 libecap3 libcap2 libdb5.3 libatomic1 dumb-init \
     && apt-get auto-remove -y && apt-get clean autoclean \
     && rm -rf /var/lib/apt/lists/* && rm -Rf /tmp/* 
 
@@ -108,4 +108,5 @@ COPY run.sh /
 RUN chmod +x /run.sh
 HEALTHCHECK CMD squidclient mgr:index | grep "HTTP/1.1 200 OK" || exit 1
 EXPOSE 3128
-ENTRYPOINT ["/run.sh"]
+ENTRYPOINT ["dumb-init"]
+CMD ["bash", "-c", "/run.sh && squid -N -n $HOSTNAME"]
diff --git a/gitlabci/docker-hub-arm.yml b/gitlabci/docker-hub-arm.yml
index 071fc60..2cf481d 100644
--- a/gitlabci/docker-hub-arm.yml
+++ b/gitlabci/docker-hub-arm.yml
@@ -66,7 +66,7 @@ push-docker-hub-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')
     - 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 
+    - docker tag $CONTAINER_BUILD_NOPROD_NAME_ARM $HUB_REGISTRY_IMAGE:latest 
     - docker push $HUB_REGISTRY_IMAGE:latest-arm
   variables:
     GIT_STRATEGY: none
diff --git a/gitlabci/docker-hub.yml b/gitlabci/docker-hub.yml
index e522c22..66292b7 100644
--- a/gitlabci/docker-hub.yml
+++ b/gitlabci/docker-hub.yml
@@ -58,7 +58,7 @@ push-docker-hub:
     - 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')
     - 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 
+    - docker tag $CONTAINER_BUILD_NOPROD_NAME_AMD64 $HUB_REGISTRY_IMAGE:latest 
     - docker push $HUB_REGISTRY_IMAGE:latest-amd64
   variables:
     GIT_STRATEGY: none
diff --git a/run.sh b/run.sh
index 70a0b6c..5c25e34 100644
--- a/run.sh
+++ b/run.sh
@@ -32,10 +32,7 @@ do
   sleep 1
 done      
 
-# Find and remove old useless caches directories (not used after limi valuet). sleep is only used to wait other containers are well started.
+# Find and remove old useless caches directories (not used after "LIMIT" value). sleep is only used to wait other containers are well started.
 mkdir /tmp/empty
 sleep 20 && find /var/cache/squid/* -maxdepth 0 -type d $LIMIT -exec rsync -a -v --delete /tmp/empty/ {}/ \; && rm -d /var/cache/squid/* 2>/dev/null &
 
-# Exec swicth squid to pid 1
-exec squid -N -n $HOSTNAME
-