Move apk to Dockerfile

2.4/Dockerfile

@@ -45,7 +45,9 @@ RUN set -ex; \
     mkdir -p "$HTTPD_PREFIX/conf/conf-enabled"; \
     mkdir -p "$HTTPD_PREFIX/conf/sites-enabled"; \
     ln -s ../conf-available/dav.conf "$HTTPD_PREFIX/conf/conf-enabled"; \
-    ln -s ../sites-available/default.conf "$HTTPD_PREFIX/conf/sites-enabled"
+    ln -s ../sites-available/default.conf "$HTTPD_PREFIX/conf/sites-enabled"; \
+    # Install openssl if we need to generate a self-signed certificate.
+    apk add --no-cache openssl
 
 COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 EXPOSE 80/tcp 443/tcp

2.4/docker-entrypoint.sh

@@ -80,10 +80,8 @@ if [ "${SSL_CERT:-none}" = "selfsigned" ]; then
     # Generate self-signed SSL certificate.
     # If SERVER_NAMES is given, use the first domain as the Common Name.
     if [ ! -e /privkey.pem ] || [ ! -e /cert.pem ]; then
-        apk add --no-cache openssl
         openssl req -x509 -newkey rsa:2048 -days 1000 -nodes \
             -keyout /privkey.pem -out /cert.pem -subj "/CN=${SERVER_NAME:-selfsigned}"
-        apk del --no-cache openssl
     fi
 fi