Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/squid:initial-adjustments into ~ubuntu-docker-images/ubuntu-docker-images/+git/squid:main

[Athos Ribeiro]

Do not generate default volume for configuration. Configuration should be provided by users and there is no point into storing the default, provided configurations into a volume.

Also, create missing cache directories to ensure they are available before starting the service.

[Sergio Durigan Junior (sergiodj)]

Thanks, Athos.

This LGTM. I was unsure whether the "squid -Nz" command would always return, but I did some tests in a container here and it seems that it does.

+1

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thank you, Sergio!

diff --git a/Dockerfile b/Dockerfile
index 605b3d2..f7a01f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,8 +20,7 @@ RUN set -eux; \
 
 EXPOSE 3128
 VOLUME /var/log/squid \
-	/var/spool/squid \
-	/etc/squid
+	/var/spool/squid
 
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh
 ENTRYPOINT ["entrypoint.sh"]
diff --git a/README.md b/README.md
index 4bf9d5a..7eccbf1 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,6 @@ Access your Squid proxy at `localhost:3128`.
 |---|---|
 | `-e TZ=UTC` | Timezone. |
 | `-p 3128:3128` | Expose the proxy service |
-| `-v /path/to/configuration:/etc/squid` | Directory with squid configuration files |
 | `-v /path/to/logs:/var/log/squid` | Volume to store squid logs |
 | `-v /path/to/data:/var/spool/squid` | Volume to store the squid cache |
 
diff --git a/data/squid.yaml b/data/squid.yaml
index 69acd08..6f90f3c 100644
--- a/data/squid.yaml
+++ b/data/squid.yaml
@@ -26,9 +26,6 @@ parameters:
     value: 3128:3128
     description: Expose the proxy service
   - type: -v
-    value: /path/to/configuration:/etc/squid
-    description: Directory with squid configuration files
-  - type: -v
     value: /path/to/logs:/var/log/squid
     description: Volume to store squid logs
   - type: -v
diff --git a/entrypoint.sh b/entrypoint.sh
index 5c3c9cd..d34a01e 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -20,4 +20,6 @@ tail -F /var/log/squid/access.log 2>/dev/null &
 tail -F /var/log/squid/error.log 2>/dev/null &
 tail -F /var/log/squid/store.log 2>/dev/null &
 tail -F /var/log/squid/cache.log 2>/dev/null &
+# create missing cache directories and exit
+/usr/sbin/squid -Nz
 /usr/sbin/squid "$@"