diff --git a/Dockerfile b/Dockerfile index 00f756e..786a43a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster +FROM debian:stable-slim ARG SQUID_VERSION ENV ENV_SQUID_VERSION=$SQUID_VERSION diff --git a/Dockerfile.arm b/Dockerfile.arm index 9dbfa7b..6e97889 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -1,4 +1,4 @@ -FROM debian:buster +FROM debian:stable-slim ARG SQUID_VERSION ENV ENV_SQUID_VERSION=$SQUID_VERSION diff --git a/run.sh b/run.sh index 5016876..fd50f8a 100644 --- a/run.sh +++ b/run.sh @@ -1,33 +1,36 @@ #!/bin/bash set -vx - # remove previous pid (if exist) after crash -rm /var/run/$HOSTNAME.pid +rm /var/run/squid.pid if [ $NOAUTO == "yes" ];then squid -z -n $HOSTNAME squid -N -n $HOSTNAME fi +# + 48h +LIMIT="-cmin +2880" -LIMIT="-cmin +1440" -FINDTIME=$(find /var/cache/squid/$HOSTNAME/* -maxdepth 0 -type d $LIMIT) +# le cache contient des repertoires pas utilisés depuis plus de $LIMIT +FINDTIME=$(find /var/spool/squid/$HOSTNAME/* -maxdepth 0 -type d $LIMIT | wc -l) +# Combien de rep en tout +NOWREP=$(find /var/spool/squid/$HOSTNAME/* -maxdepth 0 -type d | wc -l) chown -R squid /var/log/squid # Not exist or too old -if [ ! -d "/var/cache/squid/$HOSTNAME" ] || [ ! -z $FINDTIME ];then +if [ ! -d "/var/spool/squid/$HOSTNAME" ] || [ $FINDTIME == $NOWREP ];then squid -z -n $HOSTNAME - sleep 1 + sleep 5 else - touch "/var/cache/squid/$HOSTNAME" + touch "/var/spool/squid/$HOSTNAME" fi -while test -e /var/run/$HOSTNAME.pid +while test -e /var/run/squid.pid do echo "cache is generated/checked" sleep 1 -done +done # 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