Merge branch 'master' into smaller
This commit is contained in:
commit
d773c25588
@ -76,6 +76,7 @@ RUN cd ~ \
|
||||
RUN cd ~ \
|
||||
&& git clone --single-branch --branch v5.3.1 https://github.com/gravitystorm/openstreetmap-carto.git --depth 1 \
|
||||
&& cd openstreetmap-carto \
|
||||
&& 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
|
||||
|
||||
|
||||
8
run.sh
8
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
|
||||
@ -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
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user