Upgrade to latest gitit with cabal and add RTS support

ProgramFan · ProgramFan · commit e91e5145b529 · 2017-06-18T09:42:59.000+08:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,14 +1,46 @@
-## Dockerfile for gitit
+#
+# Dockerfile
+#
 
-# Use debian 9 (stretch) for gitit 0.12
-FROM debian:9
+FROM debian:8
 LABEL maintainer="Yang Zhang <zyangmath@gmail.com>"
 
-# Add gitit packages
 ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update && apt-get install -y \
-    locales git pandoc pandoc-data gitit libghc-filestore-data \
-    supervisor gosu
+# Install basic tools which will not be removed
+# The following command installs custom ghc and use cabal to install gitit
+# into system path. The building tools and intermediate haskell libraries are
+# then removed to keep the image slim. The custom ghc installation is copied
+# from library/haskell. We do not inherite from library/haskell because the
+# final image would become very large (2.4G).
+ENV ORIG_PATH $PATH
+ENV PATH /opt/cabal/1.24/bin:/opt/ghc/8.0.2/bin:/opt/happy/1.19.5/bin:/opt/alex/3.1.7/bin:$PATH
+ENV LANG C
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends apt-utils && \
+    echo 'deb http://ftp.debian.org/debian jessie-backports main' \
+        >/etc/apt/sources.list.d/backports.list && \
+    echo 'deb http://ppa.launchpad.net/hvr/ghc/ubuntu trusty main' \
+        >/etc/apt/sources.list.d/ghc.list && \
+    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F6F88286 && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends \
+        git locales supervisor gosu  \
+        cabal-install-1.24 ghc-8.0.2 happy-1.19.5 alex-3.1.7 \
+        zlib1g-dev libtinfo-dev libsqlite3-0 libsqlite3-dev \
+        ca-certificates g++ && \
+    cabal update && cabal install --prefix=/usr/local gitit && \
+    cabal install --reinstall --prefix=/usr/local --ghc-options="-rtsopts" \
+        gitit && \
+    apt-get purge -y --auto-remove \
+        cabal-install-1.24 ghc-8.0.2 happy-1.19.5 alex-3.1.7 \
+        zlib1g-dev libtinfo-dev libsqlite3-dev ca-certificates g++ && \
+    rm -rf /root/.cabal /root/.stack /root/.ghc && \
+    rm -rf /var/lib/apt/lists/* && \
+    rm -rf /usr/local/bin/*.md /usr/local/bin/doc && \
+    rm -rf /usr/local/bin/pandoc /usr/local/bin/yaml2json \
+        /usr/local/bin/json2yaml && \
+    rm -rf /usr/local/lib/x86_64-linux-ghc-8.0.2
+ENV PATH /usr/local/bin:$ORIG_PATH
 
 # Use an UTF-8 locale
 RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
diff --git a/utils/sample.supervisord.conf b/utils/sample.supervisord.conf
@@ -11,7 +11,7 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 
 [program:gitit]
 directory = /data/gitit
-command = gitit -f gitit.conf
+command = gitit -f gitit.conf +RTS -I0 -RTS
 stdout_logfile = /data/gitit/logs-%(program_name)s.log
 stderr_logfile = /data/gitit/logs-%(program_name)s.log
 autostart = true
