From 877d8800cedcbbe968b09e421dcf72650ac6dc87 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Wed, 19 Jan 2022 19:44:28 +0000 Subject: [PATCH] Add de-gfm to the docker setup. Fixes #3494. Commit ready for merge. - Legacy-Id: 19863 --- docker/app.Dockerfile | 6 +++--- docker/configs/settings_local.py | 4 +++- docker/configs/settings_local_sqlitetest.py | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docker/app.Dockerfile b/docker/app.Dockerfile index 2b349c078..525f8f252 100644 --- a/docker/app.Dockerfile +++ b/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 diff --git a/docker/configs/settings_local.py b/docker/configs/settings_local.py index 2f6207c90..6c4339581 100644 --- a/docker/configs/settings_local.py +++ b/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] \ No newline at end of file +INTERNAL_IPS = [".".join(ip.split(".")[:-1] + ["1"]) for ip in ips] + +DE_GFM_BINARY = '/usr/local/bin/de-gfm' \ No newline at end of file diff --git a/docker/configs/settings_local_sqlitetest.py b/docker/configs/settings_local_sqlitetest.py index 098a4a6fd..2d9277784 100644 --- a/docker/configs/settings_local_sqlitetest.py +++ b/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'