Skip to content

Commit eaea7d4

Browse files
committed
Updated docker build and config files.
- Legacy-Id: 14503
1 parent ed9d897 commit eaea7d4

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

docker/docker-init.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ echo "Checking that there's a virtual environment for $TAG ..."
8282
if [ ! -f $VIRTDIR/bin/activate ]; then
8383
echo "Setting up python virtualenv at /opt/home/$USER ..."
8484
mkdir -p /opt/home/$USER
85-
chown $USER /opt/home/$USER
8685
mkdir $VIRTDIR
8786
virtualenv --system-site-packages $VIRTDIR
8887
echo -e "
@@ -126,6 +125,7 @@ for sub in \
126125
developers/ietf-ftp/rfc \
127126
developers/ietf-ftp/status-changes \
128127
developers/ietf-ftp/yang/draftmod \
128+
developers/ietf-ftp/yang/ianamod \
129129
developers/ietf-ftp/yang/invalmod \
130130
developers/ietf-ftp/yang/rfcmod \
131131
developers/www6s \
@@ -154,6 +154,7 @@ if [ ! -f "/home/$USER/$CWD/test/data/group-aliases" ]; then
154154
fi
155155

156156
chown -R $USER /opt/home/$USER
157+
chmod -R g+w /usr/local/lib/ # so we can patch libs if needed
157158

158159
cd "/home/$USER/$CWD" || cd "/home/$USER/"
159160

docker/settings_local.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
TRAC_WIKI_DIR_PATTERN = "test/wiki/%s"
3232
TRAC_SVN_DIR_PATTERN = "test/svn/%s"
3333
TRAC_CREATE_ADHOC_WIKIS = [
34-
('iesg', 'Meeting', TRAC_WIKI_DIR_PATTERN % "ietf/meeting"),
3534
]
3635

3736
MEDIA_BASE_DIR = 'test'
@@ -46,6 +45,7 @@
4645
SUBMIT_YANG_RFC_MODEL_DIR = 'data/developers/ietf-ftp/yang/rfcmod/'
4746
SUBMIT_YANG_DRAFT_MODEL_DIR = 'data/developers/ietf-ftp/yang/draftmod/'
4847
SUBMIT_YANG_INVAL_MODEL_DIR = 'data/developers/ietf-ftp/yang/invalmod/'
48+
SUBMIT_YANG_IANA_MODEL_DIR = 'data/developers/ietf-ftp/yang/ianamod/'
4949
SUBMIT_YANGLINT_COMMAND = 'yanglint --verbose -p {rfclib} -p {draftlib} -p {tmplib} {model}'
5050

5151

0 commit comments

Comments
 (0)