Merge pull request #86 from swisstopo/ltbam-patch-1

Update run_valhalla.sh

Author: ltbam

conf/valhalla.conf

@@ -16,4 +16,4 @@ stdout_logfile=/app/tmp_data/logs/builder.log
 stdout_logfile_maxbytes=10MB
 # stdout_logfile=/proc/1/fd/1
 # stdout_logfile_maxbytes=0
-environment=MAX_CACHE_SIZE="%(ENV_MAX_CACHE_SIZE)s",CONCURRENCY="%(ENV_CONCURRENCY)s",DATA_DIR="/app/data",TMP_DATA_DIR="/app/tmp_data"
+environment=https_proxy="%(ENV_HTTPS_PROXY)s",http_proxy="%(ENV_HTTP_PROXY)s",MAX_CACHE_SIZE="%(ENV_MAX_CACHE_SIZE)s",CONCURRENCY="%(ENV_CONCURRENCY)s",DATA_DIR="/app/data",TMP_DATA_DIR="/app/tmp_data"

scripts/docker-entrypoint.sh

@@ -21,6 +21,8 @@ elif [ "${cmd}" == 'app' ]; then
   sed -i \
     -e "s|%(ENV_MAX_CACHE_SIZE)s|${MAX_CACHE_SIZE}|g" \
     -e "s|%(ENV_CONCURRENCY)s|${CONCURRENCY}|g" \
+    -e "s|%(ENV_HTTP_PROXY)s|${HTTP_PROXY}|g" \
+    -e "s|%(ENV_HTTPS_PROXY)s|${HTTPS_PROXY}|g" \
     "$CONF_FILE"
 
   # make sure the log directory exists for supervisor to be able to log

scripts/run_valhalla.sh

@@ -25,7 +25,7 @@ log_message "INFO: https_proxy set to $https_proxy"
 
 #set from .docker_env file in conf/valhalla.conf
 log_message "INFO: CONCURRENCY set to $CONCURRENCY"
-log_message "INFO: https_proxy set to $MAX_CACHE_SIZE"
+log_message "INFO: MAX_CACHE_SIZE set to $MAX_CACHE_SIZE"
 
 # watch the .lock file every 10 secs
 wait_for_lock() {