moin: fix to python2 versions

3 files changed, 42 insertions, 3 deletions

diff --git a/moin/Dockerfile b/moin/Dockerfile
index 28c31d6..6dbf84f 100644
--- a/moin/Dockerfile
+++ b/moin/Dockerfile
@@ -1,6 +1,8 @@
-FROM docker.io/alpine:latest
+FROM docker.io/alpine:3.10
 LABEL maintainer="Mike Crute <mike@crute.us>"
 
+ARG moin_version
+
 ADD patches/ /tmp/moin-patches
 # aspell-en (wamerican) needed?
 
@@ -42,8 +44,9 @@ RUN set -euxo pipefail; \
     && mv *.so* /usr/lib \
 # Build the latest version of moin
     && cd /tmp \
-    && git clone --depth=1 https://github.com/moinwiki/moin-1.9.git \
+    && git clone https://github.com/moinwiki/moin-1.9.git \
     && cd moin-1.9 \
+    && git checkout ${moin_version} \
     && for p in /tmp/moin-patches/*; do \
         patch -p1 < $p; \
     done \
diff --git a/moin/Makefile b/moin/Makefile
index a72d6ff..6330b72 100644
--- a/moin/Makefile
+++ b/moin/Makefile
@@ -1,8 +1,11 @@
 VERSION=latest
 IMAGE=docker.crute.me/moin
+MOIN_VERSION=6cf59082f29a2bb3bb37bed1bd525e401e524a3e
 
 all:
-        docker build -t $(IMAGE):$(VERSION) .
+        docker build \
+                --build-arg=moin_version=$(MOIN_VERSION) \
+                -t $(IMAGE):$(VERSION) .
 
 all-no-cache:
         docker build --no-cache -t $(IMAGE):$(VERSION) .
diff --git a/moin/wiki-common/plugins/macro/NoCacheRemoteImage.py b/moin/wiki-common/plugins/macro/NoCacheRemoteImage.py
new file mode 100644
index 0000000..9f37332
--- /dev/null
+++ b/moin/wiki-common/plugins/macro/NoCacheRemoteImage.py
@@ -0,0 +1,33 @@
+import time
+import urllib
+import urlparse
+
+
+QUERY_PART_INDEX = 4
+
+
+def macro_NoCacheRemoteImage(macro, url, querystring_param=None, alt=None,
+        width=None, link=True):
+    parsed = list(urlparse.urlparse(url))
+
+    query = urlparse.parse_qsl(parsed[QUERY_PART_INDEX])
+    query.append((querystring_param or "c", str(int(time.time() * 1000000))))
+
+    parsed[QUERY_PART_INDEX] = urllib.urlencode(query)
+
+    cb_url = urlparse.urlunparse(urlparse.ParseResult(*parsed))
+
+    img_args = { "class": "external image" }
+
+    if alt:
+        img_args["alt"] = alt
+        img_args["title"] = alt
+
+    if width:
+        img_args["width"] = width
+
+    return "".join([
+        macro.formatter.url(True, cb_url) if link else "",
+        macro.formatter.image(cb_url, **img_args),
+        macro.formatter.url(False) if link else "",
+    ])