Use docker-compose up -d for on-going processes (#1353)
Make targets `start-tileserver`, `start-maputnik`, and `update-osm` initialize on-going processes rather than perform a one-time task. It is more appropriate to execute them using `docker-compose up -d`. With the current `docker-compose run` execution, the user needs to run `make` as a background process. This PR also allows the use of `docker-compose logs` rather than the need to handle `stdout` and `stderr` redirection and avoids the dependency of `stdin` handling for `docker-compose run` Using `docker-compose` rather than `docker` Use appropriate` start-*` and `stop-*` make target names Resolves #1352
This commit is contained in:
@@ -27,7 +27,7 @@ services:
|
||||
networks:
|
||||
- postgres
|
||||
|
||||
openmaptiles-tools:
|
||||
openmaptiles-tools: &openmaptiles-tools
|
||||
image: "openmaptiles/openmaptiles-tools:${TOOLS_VERSION}"
|
||||
env_file: .env
|
||||
environment:
|
||||
@@ -54,6 +54,10 @@ services:
|
||||
- ./build:/mapping
|
||||
- ./cache:/cache
|
||||
|
||||
update-osm:
|
||||
<<: *openmaptiles-tools
|
||||
command: import-update
|
||||
|
||||
generate-changed-vectortiles:
|
||||
image: "openmaptiles/generate-vectortiles:${TOOLS_VERSION}"
|
||||
command: ./export-list.sh
|
||||
@@ -97,3 +101,18 @@ services:
|
||||
- "${PPORT:-8090}:${PPORT:-8090}"
|
||||
volumes:
|
||||
- .:/tileset
|
||||
|
||||
maputnik_editor:
|
||||
image: "maputnik/editor"
|
||||
ports:
|
||||
- "8088:8888"
|
||||
|
||||
tileserver-gl:
|
||||
image: "maptiler/tileserver-gl"
|
||||
command:
|
||||
- --port
|
||||
- "${TPORT:-8080}"
|
||||
ports:
|
||||
- "${TPORT:-8080}:${TPORT:-8080}"
|
||||
volumes:
|
||||
- ./data:/data
|
||||
|
||||
Reference in New Issue
Block a user