moin: add simplevisor

6 files changed, 48 insertions, 17 deletions

diff --git a/moin/Dockerfile b/moin/Dockerfile
index 6dbf84f..4a79d3a 100644
--- a/moin/Dockerfile
+++ b/moin/Dockerfile
@@ -1,3 +1,4 @@
+# This is the maximum version with all the libraries we require
 FROM docker.io/alpine:3.10
 LABEL maintainer="Mike Crute <mike@crute.us>"
 
@@ -36,7 +37,7 @@ RUN set -euxo pipefail; \
         su-exec \
 # Install libimagequant manually as it's not packaged
     && cd /tmp \
-    && git clone --depth=1 https://github.com/ImageOptim/libimagequant.git \
+    && git clone -b 2.17.0 --depth=1 https://github.com/ImageOptim/libimagequant.git \
     && cd libimagequant \
     && ./configure \
     && make shared \
@@ -59,8 +60,7 @@ RUN set -euxo pipefail; \
         markdown \
         docutils \
         textile \
-        pygments \
-        pillow \
+        pygments \ pillow \
         /tmp/moin-1.9/dist/moin-*.tar.gz \
 # Cleanup but also re-add dependencies since removing the dev packages also
 # removes the libraries (even if we install the libraries explicitly in
@@ -78,8 +78,8 @@ RUN set -euxo pipefail; \
     && rm -rf /root/.cache /tmp/*
 
 ADD wiki-common /srv/wiki-common
-ADD entrypoint.sh /
+ADD setup-moin.sh /setup-moin.sh
+ADD simplevisor /simplevisor
+ADD simplevisor.json /simplevisor.json
 
-STOPSIGNAL SIGINT
-ENTRYPOINT [ "/entrypoint.sh" ]
-CMD ["/usr/sbin/uwsgi", "--ini", "/srv/wiki-common/config/uwsgi.ini"]
+CMD [ "/simplevisor" ]
diff --git a/moin/Makefile b/moin/Makefile
index 6330b72..7821161 100644
--- a/moin/Makefile
+++ b/moin/Makefile
@@ -1,28 +1,28 @@
-VERSION=latest
 IMAGE=docker.crute.me/moin
-MOIN_VERSION=6cf59082f29a2bb3bb37bed1bd525e401e524a3e
+MOIN_VERSION=1.9.11
+IMAGE_VERSION=$(MOIN_VERSION)-1
 
 all:
         docker build \
                 --build-arg=moin_version=$(MOIN_VERSION) \
-                -t $(IMAGE):$(VERSION) .
+                -t $(IMAGE):$(IMAGE_VERSION) .
 
 all-no-cache:
-        docker build --no-cache -t $(IMAGE):$(VERSION) .
+        docker build --no-cache -t $(IMAGE):$(IMAGE_VERSION) .
 
 run-kate:
         docker run -ti --rm \
                 -p 9111:9000 \
                 -e WIKIUID=1001 \
                 -v /srv/wiki-katelin:/srv/wiki \
-                $(IMAGE):$(VERSION)
+                $(IMAGE):$(IMAGE_VERSION)
 
 run-mike:
         docker run -ti --rm \
                 -p 9111:9000 \
                 -e WIKIUID=1003 \
                 -v /srv/wiki-mike:/srv/wiki \
-                $(IMAGE):$(VERSION)
+                $(IMAGE):$(IMAGE_VERSION)
 
 publish:
-        docker push $(IMAGE):$(VERSION)
+        docker push $(IMAGE):$(IMAGE_VERSION)
diff --git a/moin/entrypoint.sh b/moin/setup-moin.sh
index 6792c18..9237dea 100755
--- a/moin/entrypoint.sh
+++ b/moin/setup-moin.sh
@@ -32,5 +32,3 @@ if [[ ! -d "/srv/wiki/data/cache/xapian/index" ]]; then
     /sbin/su-exec wiki:wiki \
         moin --config-dir /srv/wiki/config index build --mode=rebuild
 fi
-
-exec "$@"
diff --git a/moin/simplevisor.json b/moin/simplevisor.json
new file mode 100644
index 0000000..77f2a02
--- /dev/null
+++ b/moin/simplevisor.json
@@ -0,0 +1,31 @@
+{
+    "env": {
+        "pass": [
+            "PATH",
+            "HOSTNAME",
+            "SHLVL",
+            "HOME",
+            "PWD",
+
+            "MOIN_SECRETS"
+        ],
+        "vault-replace": [
+            "MOIN_SECRETS"
+        ]
+    },
+    "jobs": {
+        "init": [
+            {
+                "cmd": ["/setup-moin.sh"],
+                "run-as": "root"
+            }
+        ],
+        "main": [
+            {
+                "cmd": ["/usr/sbin/uwsgi", "--ini", "/srv/wiki-common/config/uwsgi.ini"],
+                "kill-signal": "INT",
+                "run-as": "root"
+            }
+        ]
+    }
+}
diff --git a/moin/wiki-common/config/base_config.py b/moin/wiki-common/config/base_config.py
index dbe3435..6a4574c 100644
--- a/moin/wiki-common/config/base_config.py
+++ b/moin/wiki-common/config/base_config.py
@@ -1,3 +1,4 @@
+import os
 import time
 import os.path
 from MoinMoin import user, log
@@ -116,6 +117,7 @@ class BaseConfig(DefaultConfig):
     cookie_httponly = True
     session_service = AuditingSessionService()
     can_remember = True
+    secrets = os.environ.get("MOIN_SECRETS")
 
     # Moin won't use these if the proper bindings aren't installed
     xapian_search = True
diff --git a/moin/wiki-common/config/uwsgi.ini b/moin/wiki-common/config/uwsgi.ini
index c1aad89..ac05c00 100644
--- a/moin/wiki-common/config/uwsgi.ini
+++ b/moin/wiki-common/config/uwsgi.ini
@@ -2,7 +2,7 @@
 plugin = python
 master = true
 no-orphans = true
-socket = [::]:9000
+http-socket = [::]:9000
 uid = wiki
 gid = wiki
 mime-file = /etc/mime.types