Merge ~athos-ribeiro/ubuntu-docker-images/+git/squid:4.10-20.04-snakeoil into ~ubuntu-docker-images/ubuntu-docker-images/+git/squid:4.10-20.04

[Athos Ribeiro]

Remove snakeoil build-time generated certificate and re-create it in the entrypoint when it does not exist.

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Athos.

Nitpick: s/it's/its/ (in the commit message)

Image builds and test passes.

Another suggestion below, but otherwise LGTM.

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks, Sergio!

Fixed the suggestions and merged.

diff --git a/Dockerfile b/Dockerfile
index 30b15ed..3ef3de8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,6 +14,8 @@ RUN set -eux; \
 	sed -i 's/^#http_access allow localnet$/http_access allow localnet/' /etc/squid/conf.d/debian.conf; \
 	echo "# Set max_filedescriptors to avoid using system's RLIMIT_NOFILE. See LP: #1978272" > /etc/squid/conf.d/rock.conf; \
 	echo 'max_filedescriptors 1024' >> /etc/squid/conf.d/rock.conf; \
+	# Remove the snakeoil self-signed certificate generated by the ssl-cert package
+	rm -f /etc/ssl/certs/ssl-cert-snakeoil.pem /etc/ssl/private/ssl-cert-snakeoil.key; \
 	# smoketest
 	/usr/sbin/squid --version; \
 	# create manifest \
diff --git a/entrypoint.sh b/entrypoint.sh
index d34a01e..984e54d 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -16,6 +16,11 @@
 # [1] The default configuration is changed in the Dockerfile to allow local
 # network connections. See the Dockerfile for further information.
 
+# re-create snakeoil self-signed certificate removed in the build process
+if [ ! -f /etc/ssl/private/ssl-cert-snakeoil.key ]; then
+    /usr/sbin/make-ssl-cert generate-default-snakeoil --force-overwrite > /dev/null 2>&1
+fi
+
 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 &