Upgraded moinmoin to 1.9.9 (yeah, know it is late sorry), upgraded to…

… debian stretch and simplified ssl key generation

Dockerfile

@@ -1,15 +1,15 @@
-# VERSION 0.5
+# VERSION 0.6
 # AUTHOR:         Olav Grønås Gjerde <[email protected]>
 # DESCRIPTION:    Image with MoinMoin wiki, uwsgi, nginx and self signed SSL
 # TO_BUILD:       docker build -t moinmoin .
-# TO_RUN:         docker run -it -p 80:80 -p 443:443 --name my_wiki moinmoin
+# TO_RUN:         docker run -d -p 80:80 -p 443:443 --name my_wiki moinmoin
 
-FROM debian:jessie
+FROM debian:stretch
 MAINTAINER Olav Grønås Gjerde <[email protected]>
 
 # Set the version you want of MoinMoin
-ENV MM_VERSION 1.9.8
-ENV MM_CSUM 4a616d12a03f51787ac996392f9279d0398bfb3b
+ENV MM_VERSION 1.9.9
+ENV MM_CSUM 47c86460a1ba9369da2be4e5e19f445cf4a4e6d4
 
 # Install software
 RUN apt-get update && apt-get install -qqy --no-install-recommends \

generate_ssl_key.sh

@@ -1,15 +1,3 @@
 #!/bin/bash
 
-#Required
-domain=$1
-commonname=$domain
-
-#Change to your company details
-country=NO
-state=Rogaland
-locality=Sola
-organization=example.org
-
-openssl req -x509 -newkey rsa:2048 -keyout key.pem -out cert.pem -days 3600 \
-	-nodes \
-	-subj "/CN=$domain/C=$country/ST=$state/L=$locality/O=$organization"
+openssl req -x509 -newkey rsa:4096 -sha256 -nodes -keyout key.pem -out cert.pem -subj "/CN=example.com" -days 3650