From 9547d18ac7a4c64504f139f3b3f94e6b45cc496d Mon Sep 17 00:00:00 2001
From: fredbcode <stealth@altern.org>
Date: Tue, 21 Dec 2021 11:20:43 +0100
Subject: [PATCH] Move scripts to directory

---
 Dockerfile                           | 10 ++++------
 README.md                            |  2 ++
 autoreload.sh => squid/autoreload.sh |  0
 run.sh => squid/run.sh               |  8 ++++----
 sup.sh => squid/sup.sh               |  1 -
 5 files changed, 10 insertions(+), 11 deletions(-)
 rename autoreload.sh => squid/autoreload.sh (100%)
 rename run.sh => squid/run.sh (87%)
 rename sup.sh => squid/sup.sh (99%)

diff --git a/Dockerfile b/Dockerfile
index b580ad1..6bee480 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,7 +51,7 @@ RUN echo "deb-src http://deb.debian.org/debian bullseye main contrib" >> /etc/ap
 		--with-filedescriptors=48000 \
 		--enable-delay-pools \
 		--with-large-files \
-                --with-pidfile=/tmp/squid.pid \
+                --with-pidfile=/squid/squid.pid \
                 --with-default-user=squid \
 		--enable-removal-policies="lru,heap" \
     && make \
@@ -102,12 +102,10 @@ RUN adduser --no-create-home --uid 1161 --group --system squid \
     && 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 procps inotify-tools \
     && apt-get auto-remove -y && apt-get clean autoclean \
     && rm -rf /var/lib/apt/lists/* && rm -Rf /tmp/* 
-COPY run.sh /
-COPY autoreload.sh /
-COPY sup.sh /
-RUN chmod +x /run.sh /autoreload.sh /sup.sh
+COPY --chown=1161 squid /squid
+RUN chmod +x /squid/run.sh /squid/autoreload.sh /squid/sup.sh
 HEALTHCHECK CMD squidclient mgr:info | grep "HTTP/1.1 200 OK" || exit 1
 EXPOSE 3128
 ENTRYPOINT ["dumb-init"]
 USER squid
-CMD ["bash", "-c", "/run.sh && squid -N -n $HOSTNAME"]
+CMD ["bash", "-c", "/squid/run.sh && squid -N -n $HOSTNAME"]
diff --git a/README.md b/README.md
index 72e13c1..f137f80 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,8 @@ docker-compose up --scale squid=4 -d
 
 **UID/GUID:**
 
+For security purpose image runs as a non-root user
+
 - 1161
 
 **Persistence**
diff --git a/autoreload.sh b/squid/autoreload.sh
similarity index 100%
rename from autoreload.sh
rename to squid/autoreload.sh
diff --git a/run.sh b/squid/run.sh
similarity index 87%
rename from run.sh
rename to squid/run.sh
index 2b34214..30b5142 100644
--- a/run.sh
+++ b/squid/run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-if [ -e "/tmp/squid.pid" ];then
+if [ -e "/squid/squid.pid" ];then
    echo "Squid pid: Already running ?"
-   rm /tmp/squid.pid 
+   rm /squid/squid.pid 
    pkill squid
    exit 1
 fi
@@ -27,7 +27,7 @@ done
 # if env sup
 
 # Run sup: IN BACKGROUND
-/sup.sh &
+/squid/sup.sh &
 
 if [ $(grep -c "\-s\ /certs" /etc/squid/squid.conf) -ne 0 ];then
    if [ ! -d /certs/ssl_db ]; then 
@@ -38,5 +38,5 @@ fi
 
 echo "Starting: squid"
 # Run autoreload: IN BACKGROUND
-/autoreload.sh &
+/squid/autoreload.sh &
 
diff --git a/sup.sh b/squid/sup.sh
similarity index 99%
rename from sup.sh
rename to squid/sup.sh
index 596c763..ae1ae42 100644
--- a/sup.sh
+++ b/squid/sup.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-set -vx 
 if [ -z "$supgethosts" ] && [ -z "$supicaphost" ]; then
    exit 0
 fi