Use new import-data image (#818)

This is a partial migration of https://github.com/openmaptiles/openmaptiles/pull/785

* Use `import-data` instead of `import-lakelines`, `import-water`, and `import-natural-earth`
* Upgrade docker-compose.yml to version 2.3 (allows some extra env var usage in yaml file itself)
* Remove `openmaptiles-tools:latest` usage -- no longer needed, can use current version 4.1
* `db-start` does not do a container recreation in case docker-compose.yml definition has changed.
* a few minor cleanups in quickstart.sh
This commit is contained in:
Yuri Astrakhan
2020-04-22 02:48:57 -04:00
committed by GitHub
parent a26ccedf08
commit 2ca55abb7d
6 changed files with 65 additions and 87 deletions

6
.env
View File

@@ -1,12 +1,16 @@
# This file defines default environment variables for all images
TOOLS_VERSION=4.1.0
POSTGRES_DB=openmaptiles
POSTGRES_USER=openmaptiles
POSTGRES_PASSWORD=openmaptiles
POSTGRES_HOST=postgres
POSTGRES_PORT=5432
QUICKSTART_MIN_ZOOM=0
QUICKSTART_MAX_ZOOM=7
DIFF_MODE=false
TOOLS_VERSION=4.1.0
BBOX=-180.0,-85.0511,180.0,85.0511
MIN_ZOOM=0