From 53778b2f0a6e57d91febf773fb8c2318702a38c8 Mon Sep 17 00:00:00 2001
From: fredbcode <fred@numsys.eu>
Date: Tue, 27 Apr 2021 17:10:40 +0200
Subject: [PATCH] Add new argument NOAUTO (remove scale)

---
 Dockerfile |  6 ++++--
 run.sh     | 11 +++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d686721..6b33c6e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,12 @@
 FROM debian:buster
 
+ARG SQUID_VERSION
+ARG NOAUTO 
+
 ENV SQUID_CACHE_DIR=/var/spool/squid \
     SQUID_LOG_DIR=/var/log/squid \
     SQUID_USER=proxy 
-
-ARG SQUID_VERSION
+    NOAUTO=${NOAUTO}
 
 WORKDIR /tmp
 RUN echo "deb-src http://deb.debian.org/debian buster main contrib" >> /etc/apt/sources.list && apt-get update && apt-get --no-install-recommends -y build-dep squid && apt-get --no-install-recommends -y install wget tar xz-utils libssl-dev libssl1.1 winbind \
diff --git a/run.sh b/run.sh
index 2f9772d..7a32c53 100644
--- a/run.sh
+++ b/run.sh
@@ -1,14 +1,21 @@
 #!/bin/sh
 set -vx
+
 # remove previous pid (if exist) after crash
 rm /var/run/$HOSTNAME.pid
 
+if [ -z $NOAUTO ];then
+    squid -z -n $HOSTNAME
+    squid -N -n $HOSTNAME
+fi
+
+
 LIMIT="-cmin +1440"
 FINDTIME=$(find /var/cache/squid/$HOSTNAME/* -maxdepth 0 -type d $LIMIT)
 
 chown -R squid /var/log/squid 
 
-# Si le cache n'existe pas OU rep trop ANCIEN
+# Not exist or too old
 if [ ! -d "/var/cache/squid/$HOSTNAME" ] || [ ! -z $FINDTIME ];then
   squid -z -n $HOSTNAME
   sleep 1
@@ -22,7 +29,7 @@ do
   sleep 1
 done                	              	
 
-# Find and remove old useless caches directories (not used after limit). Sleep is here to wait for all containers to start.
+# Find and remove old useless caches directories (not used after limi valuet). 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 &