Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conf/valhalla.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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=no_proxy="%(ENV_NO_PROXY)s",pbf_local_path="%(ENV_PBF_LOCAL_PATH)s",pbf_url="%(ENV_PBF_URL)s",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",PBF_LOCAL_PATH="%(ENV_PBF_LOCAL_PATH)s",PBF_URL="%(ENV_PBF_URL)s",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"
8 changes: 4 additions & 4 deletions scripts/run_valhalla.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ 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"
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"
Expand Down Expand Up @@ -103,7 +103,7 @@ while true; do
UPDATE_OSM="True"
if ! [ -f "$PBF" ]; then
log_message "INFO: Downloading OSM file $PBF"
wget -nv $PBF_URL -O "$PBF" || exit 1
wget -nv "$PBF_URL" -O "$PBF" || exit 1
UPDATE_OSM="False"
fi

Expand Down
8 changes: 4 additions & 4 deletions scripts/update_osm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ log_message() {
echo "build_loop: $(date "+%Y-%m-%d %H:%M:%S") $1"
}

log_message "update-osm http_proxy set to: $http_proxy"
log_message "update-osm https_proxy set to: $https_proxy"
log_message "update-osm pbf_local_path set to: $pbf_local_path"
log_message "update-osm HTTP_PROXY set to: $HTTP_PROXY"
log_message "update-osm HTTPS_PROXY set to: $HTTPS_PROXY"
log_message "update-osm PBF_LOCAL_PATH set to: $PBF_LOCAL_PATH"

pbf=$pbf_local_path
pbf="$PBF_LOCAL_PATH"

# Get the arguments
while [ "$1" != "" ]; do
Expand Down
Loading