code-host: update to py3 and link rst2html

2 files changed, 4 insertions, 1 deletions

diff --git a/code-host/Dockerfile b/code-host/Dockerfile
index 646c7f6..4de5043 100644
--- a/code-host/Dockerfile
+++ b/code-host/Dockerfile
@@ -11,12 +11,14 @@ RUN \
         gitolite \
         openssh \
         perl-json \
-        py-pygments \
+        py3-pygments \
+        py3-docutils \
         runit \
         su-exec \
         uwsgi \
         uwsgi-cgi \
         uwsgi-router_static \
+    && ln -s /usr/bin/rst2html /usr/bin/rst2html.py \
     && addgroup -g 1005 -S code \
     && adduser -u 1005 -s /bin/sh -S -h /srv/code -H -D -G code code
 
diff --git a/code-host/Makefile b/code-host/Makefile
index 43a832c..6badfbc 100644
--- a/code-host/Makefile
+++ b/code-host/Makefile
@@ -1,6 +1,7 @@
 IMAGE=docker.crute.me/code-host:latest
 
 all:
+        docker pull alpine:edge
         docker build -t $(IMAGE) .
 
 all-no-cache: