Upgrade to tools v5 - rm import-osm, new downloader... (#785)

Update to tools v5. See https://github.com/openmaptiles/openmaptiles-tools/releases/tag/v5.0.0 for the list of all changes. Other OMT-repo specific changes:

* removes `import-osm` docker usage, replacing it with `openmaptiles-tools`
* quickstart builds faster because it uses postgres with preloaded water, natural earth, and lake centerlines tables.

### Makefile targets
* `tools-dev` will open a shell in a docker to experiment and debug (instead of `import-sql-dev` and `import-osm-dev`)
* separated `start-maputnik` from `start-postserve`
* renamed `clean-docker` into `db-destroy` to make it more explicit
* cleaner `db-start`, `db-stop`, `db-destroy` targets
* `db-start-preloaded` is the same as `db-start`, except that it uses `postgis-preloaded` -- an image with preloaded water, natural-earth, and lake centerline data
* `db-start` will not recreate the container if it already exists -- this way if it was started as preloaded, it will not be rebuilt.
* better output messages

### Quickstart
* uses `postgis-preloaded` image by default to make quickstart quicker.  To start with a clean db, pass 2 parameters to quickstart, e.g. `./quickstart.sh albania empty`
This commit is contained in:
Yuri Astrakhan
2020-05-05 11:53:09 -04:00
committed by GitHub
parent 785ec93799
commit 0cae7b9fd6
8 changed files with 110 additions and 112 deletions

View File

@@ -12,13 +12,14 @@ services:
postgres:
image: "${POSTGIS_IMAGE:-openmaptiles/postgis}:${TOOLS_VERSION}"
# Use "command: postgres -c jit=off" for PostgreSQL 11+ because of slow large MVT query processing
volumes:
- pgdata:/var/lib/postgresql/data
networks:
- postgres_conn
ports:
- "5432"
env_file: .env
env_file: .env-postgres
import-data:
image: "openmaptiles/import-data:${TOOLS_VERSION}"
@@ -26,44 +27,6 @@ services:
networks:
- postgres_conn
import-osm:
image: "openmaptiles/import-osm:${TOOLS_VERSION}"
env_file: .env
environment:
DIFF_MODE: ${DIFF_MODE}
networks:
- postgres_conn
volumes:
- ./data:/import
- ./build:/mapping
- ./cache:/cache
import-osm-diff:
image: "openmaptiles/import-osm:${TOOLS_VERSION}"
env_file: .env
command: ./import_diff.sh
environment:
DIFF_MODE: ${DIFF_MODE}
networks:
- postgres_conn
volumes:
- ./data:/import
- ./build:/mapping
- ./cache:/cache
update-osm:
image: "openmaptiles/import-osm:${TOOLS_VERSION}"
env_file: .env
environment:
DIFF_MODE: ${DIFF_MODE}
command: ./import_update.sh
networks:
- postgres_conn
volumes:
- ./data:/import
- ./build:/mapping
- ./cache:/cache
openmaptiles-tools:
image: "openmaptiles/openmaptiles-tools:${TOOLS_VERSION}"
env_file: .env