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

Set no_proxy, fix valhalla URL

Author: ltbam

.github/workflows/deploy-int.yaml

@@ -38,6 +38,7 @@ jobs:
           MAX_CACHE_SIZE=${{ vars.MAX_CACHE_SIZE }}
           HTTP_PROXY=${{ vars.HTTP_PROXY }}
           HTTPS_PROXY=${{ vars.HTTPS_PROXY }}
+          NO_PROXY=${{ vars.NO_PROXY }}
           EOF
 
           cat > .env <<EOF

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=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"
+environment=no_proxy="%(ENV_NO_PROXY)s",%(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

@@ -2,10 +2,13 @@
 
 cmd=${1}
 
-# either starts a worker or the app itself
+# starts the worker
+# access valhalla server with http://app
 if [ "${cmd}" == 'worker' ]; then
   # Start the worker
   exec /app/app_venv/bin/arq routing_packager_app.worker.WorkerSettings
+# starts the app
+# access valhalla server with http://app or http://localhost
 elif [ "${cmd}" == 'app' ]; then
   # SSL? Provided by .docker_env with path mapped in docker-compose.yml
   opts=''
@@ -23,6 +26,7 @@ elif [ "${cmd}" == 'app' ]; then
     -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" \
+    -e "s|%(ENV_NO_PROXY)s|${NO_PROXY}|g" \
     "$CONF_FILE"
 
   # make sure the log directory exists for supervisor to be able to log

scripts/run_valhalla.sh

@@ -22,6 +22,7 @@ log_message() {
 #set from .docker_env file
 log_message "INFO: http_proxy set to $http_proxy"
 log_message "INFO: https_proxy set to $https_proxy"
+log_message "INFO: no_proxy set to $no_proxy"
 
 #set from .docker_env file in conf/valhalla.conf
 log_message "INFO: CONCURRENCY set to $CONCURRENCY"