From ce176ae32e22f9c51e46c26396feec316db9c294 Mon Sep 17 00:00:00 2001 From: Alexander Overvoorde Date: Fri, 3 Sep 2021 12:46:37 +0200 Subject: [PATCH 1/3] Fix erroneous quotes around WGET_ARGS (fixes #210) --- run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run.sh b/run.sh index dcee9d6..f09d913 100755 --- a/run.sh +++ b/run.sh @@ -50,10 +50,10 @@ if [ "$1" = "import" ]; then if [ -n "$DOWNLOAD_PBF" ]; then echo "INFO: Download PBF file: $DOWNLOAD_PBF" - wget "$WGET_ARGS" "$DOWNLOAD_PBF" -O /data.osm.pbf + wget $WGET_ARGS "$DOWNLOAD_PBF" -O /data.osm.pbf if [ -n "$DOWNLOAD_POLY" ]; then echo "INFO: Download PBF-POLY file: $DOWNLOAD_POLY" - wget "$WGET_ARGS" "$DOWNLOAD_POLY" -O /data.poly + wget $WGET_ARGS "$DOWNLOAD_POLY" -O /data.poly fi fi From 60ac7657d1a0246a42f6c52557d3324e55f36be5 Mon Sep 17 00:00:00 2001 From: Alexander Overvoorde Date: Fri, 3 Sep 2021 12:51:45 +0200 Subject: [PATCH 2/3] Don't clutter output of usage instructions --- run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run.sh b/run.sh index f09d913..2fc0aa0 100755 --- a/run.sh +++ b/run.sh @@ -1,7 +1,5 @@ #!/bin/bash -set -x - function createPostgresConfig() { cp /etc/postgresql/12/main/postgresql.custom.conf.tmpl /etc/postgresql/12/main/conf.d/postgresql.custom.conf sudo -u postgres echo "autovacuum = $AUTOVACUUM" >> /etc/postgresql/12/main/conf.d/postgresql.custom.conf @@ -23,6 +21,8 @@ if [ "$#" -ne 1 ]; then exit 1 fi +set -x + if [ "$1" = "import" ]; then # Ensure that database directory is in right state chown postgres:postgres -R /var/lib/postgresql From 0a4d079b0815cf7640ae4050642d8509e6ce552f Mon Sep 17 00:00:00 2001 From: Andrey Prih Date: Tue, 7 Sep 2021 22:39:35 +0300 Subject: [PATCH 3/3] fix naciscdn.org (#212) * fix naciscdn.org * fix Co-authored-by: prih --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index b4565be..134503d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -131,6 +131,7 @@ RUN mkdir -p /home/renderer/src \ && git clone --single-branch --branch v5.3.1 https://github.com/gravitystorm/openstreetmap-carto.git --depth 1 \ && cd openstreetmap-carto \ && rm -rf .git \ + && sed -ie 's#https:\/\/naciscdn.org\/naturalearth\/110m\/cultural\/ne_110m_admin_0_boundary_lines_land.zip#https:\/\/naturalearth.s3.amazonaws.com\/110m_cultural\/ne_110m_admin_0_boundary_lines_land.zip#g' external-data.yml \ && npm install -g carto@0.18.2 \ && carto project.mml > mapnik.xml