adapt Docker

Author: vladak

Dockerfile

@@ -96,7 +96,7 @@ ENV CLASSPATH /usr/local/tomcat/bin/bootstrap.jar:/usr/local/tomcat/bin/tomcat-j
 COPY docker/logging.properties /usr/local/tomcat/conf/logging.properties
 RUN sed -i -e 's/Valve/Disabled/' /usr/local/tomcat/conf/server.xml
 
-# add our scripts
+# add our scripts and configuration
 COPY docker /scripts
 RUN chmod -R +x /scripts
 

docker/start.py

@@ -76,6 +76,7 @@
 OPENGROK_JAR = os.path.join(OPENGROK_LIB_DIR, 'opengrok.jar')
 
 NOMIRROR_ENV_NAME = 'NOMIRROR'
+API_TIMEOUT_ENV_NAME = 'API_TIMEOUT'
 
 expected_token = None
 periodic_timer = None
@@ -481,16 +482,16 @@ def main():
         setup_redirect_source(logger, url_root)
 
     api_timeout = 8
-    if os.environ.get('API_TIMEOUT'):
-        api_timeout = int(os.environ.get('API_TIMEOUT'))
-    extra_indexer_options = "--connectTimeout " + str(api_timeout)
+    if os.environ.get(API_TIMEOUT_ENV_NAME):
+        api_timeout = int(os.environ.get(API_TIMEOUT_ENV_NAME))
+    else:
+        os.environ[API_TIMEOUT_ENV_NAME] = str(api_timeout)
 
     env = {}
-    indexer_opt = os.environ.get('INDEXER_OPT', '')
-    if indexer_opt:
-        extra_indexer_options += " " + indexer_opt
-    logger.info("extra indexer options: '{}'".format(extra_indexer_options))
-    env['OPENGROK_INDEXER_OPTIONAL_ARGS'] = extra_indexer_options
+    extra_indexer_options = os.environ.get('INDEXER_OPT', '')
+    if extra_indexer_options:
+        logger.info("extra indexer options: '{}'".format(extra_indexer_options))
+        env['OPENGROK_INDEXER_OPTIONAL_ARGS'] = extra_indexer_options
 
     if os.environ.get(NOMIRROR_ENV_NAME):
         env[OPENGROK_NO_MIRROR_ENV] = os.environ.get(NOMIRROR_ENV_NAME)

docker/sync.yml

@@ -7,15 +7,17 @@ commands:
       duration: PT1H
       tags: ['%PROJECT%']
       text: resync + reindex in progress
-- command: [opengrok-mirror, -c, '/opengrok/etc/mirror.yml', -I, -U, '%URL%', '%PROJECT%']
-- command: [opengrok-reindex-project, --printoutput,
-    --api_timeout, '%API_TIMEOUT',
-    --jar, /opengrok/lib/opengrok.jar, -U, '%URL%', -P, '%PROJECT%', --,
-    --connectTimeout, '%API_TIMEOUT',
-    -r, dirbased, -G, -m, '256', --leadingWildCards, 'on',
-    -c, /usr/local/bin/ctags, -U, '%URL%', -H, '%PROJECT%']
-  limits: {RLIMIT_NOFILE: 1024}
-  args_subst: {"%API_TIMEOUT%": $API_TIMEOUT}
+- command:
+    args: [opengrok-mirror, -c, '/opengrok/etc/mirror.yml', -I, -U, '%URL%', '%PROJECT%']
+- command:
+    args: [opengrok-reindex-project, --printoutput,
+      --api_timeout, '%API_TIMEOUT%',
+      --jar, /opengrok/lib/opengrok.jar, -U, '%URL%', -P, '%PROJECT%', --,
+      --connectTimeout, '%API_TIMEOUT%',
+      -r, dirbased, -G, -m, '256', --leadingWildCards, 'on',
+      -c, /usr/local/bin/ctags, -U, '%URL%', -H, '%PROJECT%']
+    limits: {RLIMIT_NOFILE: 1024}
+    args_subst: {"%API_TIMEOUT%": "$API_TIMEOUT"}
 - call:
     uri: '%URL%api/v1/messages?tag=%PROJECT%'
     method: DELETE