Merge branch 'master' into aee/custom-postgresql.conf

.env

@@ -20,7 +20,7 @@ PGPORT=5432
 BBOX=-11.36801,57.55323,35.52711,81.05195
 
 # Which zooms to generate with   make generate-tiles-pg
-MIN_ZOOM=11
+MIN_ZOOM=0
 MAX_ZOOM=14
 
 # `MID_ZOOM` setting only works with `make generate-tiles-pg` command.  Make sure MID_ZOOM < MAX_ZOOM.
@@ -36,7 +36,7 @@ BORDERS_CLEANUP=false
 
 # The current setup assumes this file is placed inside the data/ dir
 # scp -i ~/.ssh/azeonYR.txt azureuser@51.120.246.222:/datadrive/openmaptilesNO/data/NRK-OSMdata-planet_v01.mbtiles /Users/n651611/Documents/GitHub/openmaptilesNO/data/
-MBTILES_FILE=NRK-water_v02.mbtiles
+MBTILES_FILE=NRK-norway_v01.mbtiles
 
 
 # This is the current repl_config.json location, pre-configured in the tools Dockerfile

docker-compose.yml

@@ -14,7 +14,7 @@ services:
     command: postgres -c 'config_file=/etc/postgresql/postgresql.conf'
     # Use "command: postgres -c jit=off" for PostgreSQL 11+ because of slow large MVT query processing
     # Use "shm_size: 512m" if you want to prevent a possible 'No space left on device' during 'make generate-tiles-pg'
-    shm_size: 60g
+    shm_size: 1g
     volumes:
       - pgdata:/var/lib/postgresql/data
       - ./etc/postgresql/postgresql.conf:/etc/postgresql/postgresql.conf
@@ -29,6 +29,7 @@ services:
       POSTGRES_USER: ${PGUSER:-openmaptiles}
       POSTGRES_PASSWORD: ${PGPASSWORD:-openmaptiles}
       PGPORT: ${PGPORT:-5432}
+      TILE_TIMEOUT: 3600000
 
   import-data:
     image: "openmaptiles/import-data:${TOOLS_VERSION}"