altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged in [19863] from rjsparks@nostrum.com:

Browse source 
Add de-gfm to the docker setup. Fixes #3494.
 - Legacy-Id: 19864
Note: SVN reference [19863] has been migrated to Git commit 877d8800ce
This commit is contained in:
Robert Sparks 2022-01-19 19:46:19 +00:00
parent 33e2ba9b86 877d8800ce
commit 35d252be6c
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docker/app.Dockerfile
View file

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

4
docker/configs/settings_local.py
View file

@ -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 # Set INTERNAL_IPS for use within Docker. See https://knasmueller.net/fix-djangos-debug-toolbar-not-showing-inside-docker
import socket import socket
hostname, _, ips = socket.gethostbyname_ex(socket.gethostname()) 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'

2
docker/configs/settings_local_sqlitetest.py
View file

@ -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_INVAL_MODEL_DIR = 'data/developers/ietf-ftp/yang/invalmod/'
SUBMIT_YANG_IANA_MODEL_DIR = 'data/developers/ietf-ftp/yang/ianamod/' SUBMIT_YANG_IANA_MODEL_DIR = 'data/developers/ietf-ftp/yang/ianamod/'
SUBMIT_YANG_RFC_MODEL_DIR = 'data/developers/ietf-ftp/yang/rfcmod/' SUBMIT_YANG_RFC_MODEL_DIR = 'data/developers/ietf-ftp/yang/rfcmod/'
DE_GFM_BINARY = '/usr/local/bin/de-gfm'