Merge ~athos-ribeiro/ubuntu-docker-images/+git/postgresql:14-22.04-snakeoil into ~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql:14-22.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, Athos.

Same nitpick regarding the commit message & using full path when invoking the binary. Otherwise, LGTM.

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks Sergio!

Fixed the suggestions and merged.

diff --git a/Dockerfile b/Dockerfile
index b9819f5..99d87af 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -57,6 +57,8 @@ RUN set -eux; \
 	find /usr -name '*.pyc' -type f -exec bash -c 'for pyc; do dpkg -S "$pyc" &> /dev/null || rm -vf "$pyc"; done' -- '{}' +; \
 # smoke test
 	gosu nobody true; \
+# 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; \
 # create manifest
 	mkdir -p /usr/share/rocks; \
 	(echo "# os-release" && cat /etc/os-release && echo "# dpkg-query" && dpkg-query -f '${db:Status-Abbrev},${binary:Package},${Version},${source:Package},${Source:Version}\n' -W) > /usr/share/rocks/dpkg.query;
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 51d871b..655c3a1 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -2,6 +2,11 @@
 set -Eeo pipefail
 # TODO swap to -Eeuo pipefail above (after handling all potentially-unset variables)
 
+# 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
+
 # usage: file_env VAR [DEFAULT]
 #    ie: file_env 'XYZ_DB_PASSWORD' 'example'
 # (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of