Make a bunch of rsync'ed assets available as part of the image.

 - Legacy-Id: 19496

Author: larseggert

docker/Dockerfile

@@ -128,6 +128,22 @@ RUN sed -i 's/\[mysqld\]/\[mysqld\]\ninnodb_buffer_pool_size = 1G\ninnodb_log_bu
     rm -rf /ietf_utf8.sql /mariadb-sys-master && \
     mv /var/lib/mysql /
 
+# Make various assets available
+RUN mkdir -p /root/data/proceedings
+ENV RSYNC_OPT="-auz --info=progress2 --exclude *.p7s --exclude *.xml --exclude *.html --exclude *.pdf --exclude *.ps --exclude *.Z --exclude *.mib --exclude *.ZIP"
+RUN rsync $RSYNC_OPT ftp.rfc-editor.org::rfcs-text-only/      /root/data/rfc/
+RUN rsync $RSYNC_OPT rsync.ietf.org::charter/                 /root/data/charter/
+RUN rsync $RSYNC_OPT rsync.ietf.org::conflict-reviews/        /root/data/conflict-reviews/
+RUN rsync $RSYNC_OPT rsync.ietf.org::dev.media/floor/         /root/data/floor/
+RUN rsync $RSYNC_OPT rsync.ietf.org::everything-ftp/yang/     /root/data/yang/
+RUN rsync $RSYNC_OPT rsync.ietf.org::id-archive/              /root/data/internet-drafts/
+RUN rsync $RSYNC_OPT rsync.ietf.org::status-changes/          /root/data/status-changes/
+# These are either very large or unneeded:
+#RUN rsync $RSYNC_OPT rsync.ietf.org::dev.media/photo/         /root/data/photo/
+#RUN rsync $RSYNC_OPT rsync.ietf.org::everything-ftp/review/   /root/data/review/
+#RUN rsync $RSYNC_OPT rsync.ietf.org::rfc/                     /root/data/rfc/
+#RUN rsync $RSYNC_OPT rsync.ietf.org::slides/                  /root/data/slides/
+
 # Copy the startup file
 COPY docker-init.sh /docker-init.sh
 RUN chmod +x /docker-init.sh

docker/docker-init.sh

@@ -30,9 +30,16 @@ if ! service mariadb status; then
     exit 1
 fi
 
+echo
 if [ ! -f /root/src/ietf/settings_local.py ]; then
-    echo "Setting up a default settings_local.py ..."
+    echo "Setting up a default ietf/settings_local.py file"
     cp /root/src/docker/settings_local.py /root/src/ietf/settings_local.py
+else
+    echo "Using existing ietf/settings_local.py file"
+    if ! cmp -s /root/src/docker/settings_local.py /root/src/ietf/settings_local.py; then
+        echo "NOTE: Differences detected compared to docker/settings_local.py!"
+        echo "We'll assume you made these deliberately."
+    fi
 fi
 
 for sub in					\

docker/rsync-extras

@@ -1,61 +1,39 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-import six
-if six.PY3:
-    from typing import Collection, Dict, List, Tuple      # pyflakes:ignore
-
-SECRET_KEY = 'jzv$o93h_lzw4a0%0oz-5t5lk+ai=3f8x@uo*9ahu8w4i300o6'
-
 DATABASES = {
-    'default': {
-        'NAME': 'ietf_utf8',
-        'ENGINE': 'django.db.backends.mysql',
-        'USER': 'django',
-        'PASSWORD': 'RkTkDPFnKpko',
-        'OPTIONS': {
-            'sql_mode': 'STRICT_TRANS_TABLES',
-            'init_command': 'SET storage_engine=InnoDB; SET names "utf8"',
+    "default": {
+        "NAME": "ietf_utf8",
+        "ENGINE": "django.db.backends.mysql",
+        "USER": "django",
+        "PASSWORD": "RkTkDPFnKpko",
+        "OPTIONS": {
+            "sql_mode": "STRICT_TRANS_TABLES",
+            "init_command": 'SET storage_engine=InnoDB; SET names "utf8"',
         },
     },
-}                                       # type: Dict[str, Dict[str, Collection[str]]]
+}
 
-DATABASE_TEST_OPTIONS = {
-    'init_command': 'SET storage_engine=InnoDB',
-    }
+USING_DEBUG_EMAIL_SERVER = True
+EMAIL_HOST = "localhost"
+EMAIL_PORT = 2025
 
 IDSUBMIT_IDNITS_BINARY = "/usr/local/bin/idnits"
+
 IDSUBMIT_REPOSITORY_PATH = "test/id/"
 IDSUBMIT_STAGING_PATH = "test/staging/"
-INTERNET_DRAFT_ARCHIVE_DIR = "test/archive/"
-INTERNET_ALL_DRAFTS_ARCHIVE_DIR = "test/archive/"
-RFC_PATH = "test/rfc/"
-
-AGENDA_PATH = 'data/developers/www6s/proceedings/'
-MEETINGHOST_LOGO_PATH = AGENDA_PATH
-
-USING_DEBUG_EMAIL_SERVER=True
-EMAIL_HOST='localhost'
-EMAIL_PORT=2025
-
-TRAC_WIKI_DIR_PATTERN = "test/wiki/%s"
-TRAC_SVN_DIR_PATTERN = "test/svn/%s"
-TRAC_CREATE_ADHOC_WIKIS = [
-]                                       # type: List[Tuple[str, str, str]]
-
-MEDIA_BASE_DIR = 'test'
-MEDIA_ROOT = MEDIA_BASE_DIR + '/media/'
-MEDIA_URL = '/media/'
-
-PHOTOS_DIRNAME = 'photo'
-PHOTOS_DIR = MEDIA_ROOT + PHOTOS_DIRNAME
-
-DOCUMENT_PATH_PATTERN = 'data/developers/ietf-ftp/{doc.type_id}/'
-
-SUBMIT_YANG_CATALOG_MODEL_DIR = 'data/developers/ietf-ftp/yang/catalogmod/'
-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/'
-
 
+AGENDA_PATH = "/root/data/proceedings/"
+BOFREQ_PATH = "/nonexistent"  # not on rsync yet?
+CHARTER_PATH = "/root/data/charter/"
+CONFLICT_REVIEW_PATH = "/root/data/conflict-review/"
+FLOORPLAN_DIR = "/root/data/floor/"
+INTERNET_DRAFT_PATH = "/root/data/internet-drafts/"
+INTERNET_ALL_DRAFTS_ARCHIVE_DIR = INTERNET_DRAFT_PATH
+INTERNET_DRAFT_ARCHIVE_DIR = INTERNET_DRAFT_PATH
+RFC_PATH = "/root/data/rfc/"
+STATUS_CHANGE_PATH = "/root/data/status-change/"
+SUBMIT_YANG_CATALOG_MODEL_DIR = "/root/data/yang/catalogmod/"
+SUBMIT_YANG_DRAFT_MODEL_DIR = "/root/data/yang/draftmod/"
+SUBMIT_YANG_IANA_MODEL_DIR = "/root/data/yang/ianamod/"
+SUBMIT_YANG_RFC_MODEL_DIR = "/root/data/yang/rfcmod/"