Add de-gfm to the docker setup. Fixes #3494. Commit ready for merge.

- Legacy-Id: 19863

docker/app.Dockerfile

@@ -59,6 +59,7 @@ RUN apt-get install -qy \
 	rsync \
 	rsyslog \
     ruby \
+    ruby-rubygems \
 	subversion \
 	unzip \
 	wget \
@@ -67,9 +68,8 @@ RUN apt-get install -qy \
     yang-tools \
 	zsh
 
-# Install Kramdown (ruby)
-RUN gem install kramdown && \
-    gem install kramdown-parser-gfm
+# Install kramdown-rfc2629 (ruby)
+RUN gem install kramdown-rfc2629
 
 # Install chromedriver if supported
 COPY docker/scripts/app-install-chromedriver.sh /tmp/app-install-chromedriver.sh

docker/configs/settings_local.py

@@ -59,4 +59,6 @@ SUBMIT_YANG_RFC_MODEL_DIR   = 'data/developers/ietf-ftp/yang/rfcmod/'
 # Set INTERNAL_IPS for use within Docker. See https://knasmueller.net/fix-djangos-debug-toolbar-not-showing-inside-docker
 import socket
 hostname, _, ips = socket.gethostbyname_ex(socket.gethostname())
-INTERNAL_IPS = [".".join(ip.split(".")[:-1] + ["1"]) for ip in ips]
+INTERNAL_IPS = [".".join(ip.split(".")[:-1] + ["1"]) for ip in ips]
+
+DE_GFM_BINARY = '/usr/local/bin/de-gfm'

docker/configs/settings_local_sqlitetest.py

@@ -80,3 +80,5 @@ SUBMIT_YANG_DRAFT_MODEL_DIR = 'data/developers/ietf-ftp/yang/draftmod/'
 SUBMIT_YANG_INVAL_MODEL_DIR = 'data/developers/ietf-ftp/yang/invalmod/'
 SUBMIT_YANG_IANA_MODEL_DIR = 'data/developers/ietf-ftp/yang/ianamod/'
 SUBMIT_YANG_RFC_MODEL_DIR   = 'data/developers/ietf-ftp/yang/rfcmod/'
+
+DE_GFM_BINARY = '/usr/local/bin/de-gfm'