cerxes/openmaptiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use unified tools version 3.1.0 for all images (#707)

Browse Source 
* Use unified tools version for all images
* do not start postserve as part of quickstart, but added a help message how to start it
* wait for SQL start with pgwait
This commit is contained in:
Yuri Astrakhan
2019-12-12 12:40:31 -05:00
committed by GitHub
parent c02ec2176f
commit 132747d9b5
7 changed files with 52 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
docker-compose.yml
View File

@@ -4,7 +4,7 @@ volumes:
cache:
services:
postgres:
image: "openmaptiles/postgis:2.9"
image: "openmaptiles/postgis:${TOOLS_VERSION}"
volumes:
- pgdata:/var/lib/postgresql/data
networks:
@@ -13,22 +13,22 @@ services:
- "5432"
env_file: .env
import-natural-earth:
image: "openmaptiles/import-natural-earth:1.4"
image: "openmaptiles/import-natural-earth:${TOOLS_VERSION}"
env_file: .env
networks:
- postgres_conn
import-water:
image: "openmaptiles/import-water:1.2"
image: "openmaptiles/import-water:${TOOLS_VERSION}"
env_file: .env
networks:
- postgres_conn
import-lakelines:
image: "openmaptiles/import-lakelines:1.0"
image: "openmaptiles/import-lakelines:${TOOLS_VERSION}"
env_file: .env
networks:
- postgres_conn
import-osm:
image: "openmaptiles/import-osm:0.5"
image: "openmaptiles/import-osm:${TOOLS_VERSION}"
env_file: .env
environment:
DIFF_MODE: ${DIFF_MODE}
@@ -39,12 +39,12 @@ services:
- ./build:/mapping
- cache:/cache
import-osmborder:
image: "openmaptiles/import-osmborder:0.4"
image: "openmaptiles/import-osmborder:${TOOLS_VERSION}"
env_file: .env
networks:
- postgres_conn
import-osm-diff:
image: "openmaptiles/import-osm:0.5"
image: "openmaptiles/import-osm:${TOOLS_VERSION}"
env_file: .env
command: ./import_diff.sh
environment:
@@ -56,7 +56,7 @@ services:
- ./build:/mapping
- cache:/cache
update-osm:
image: "openmaptiles/import-osm:0.5"
image: "openmaptiles/import-osm:${TOOLS_VERSION}"
env_file: .env
environment:
DIFF_MODE: ${DIFF_MODE}
@@ -68,14 +68,18 @@ services:
- ./build:/mapping
- cache:/cache
import-sql:
image: "openmaptiles/import-sql:1.0"
# This target is obsolete, and was left for backwards compatibility
# Use openmaptiles-tools target instead
image: "openmaptiles/openmaptiles-tools:${TOOLS_VERSION}"
command: import-sql
env_file: .env
networks:
- postgres_conn
volumes:
- .:/tileset
- ./build:/sql
import-wikidata:
image: "openmaptiles/import-wikidata:0.1"
image: "openmaptiles/import-wikidata:${TOOLS_VERSION}"
env_file: .env
command: import-wikidata
networks:
@@ -83,7 +87,7 @@ services:
volumes:
- ./wikidata:/import
openmaptiles-tools:
image: "openmaptiles/openmaptiles-tools:0.9.2"
image: "openmaptiles/openmaptiles-tools:${TOOLS_VERSION}"
env_file: .env
networks:
- postgres_conn
@@ -91,7 +95,7 @@ services:
- .:/tileset
- ./build:/sql
generate-changed-vectortiles:
image: "openmaptiles/generate-vectortiles:0.1.1"
image: "openmaptiles/generate-vectortiles:${TOOLS_VERSION}"
command: ./export-list.sh
volumes:
- ./data:/export
@@ -100,7 +104,7 @@ services:
- postgres_conn
env_file: .env
generate-vectortiles:
image: "openmaptiles/generate-vectortiles:0.1.1"
image: "openmaptiles/generate-vectortiles:${TOOLS_VERSION}"
volumes:
- ./data:/export
- ./build/openmaptiles.tm2source:/tm2source
@@ -108,20 +112,19 @@ services:
- postgres_conn
env_file: .env
environment:
#BBOX: "8.25,46.97,9.58,47.52"
#BBOX: "5.97,45.75,10.7,47.72"
BBOX: ${BBOX}
MIN_ZOOM: ${MIN_ZOOM}
MAX_ZOOM: ${MAX_ZOOM}
postserve:
image: "openmaptiles/postserve:0.2"
image: "openmaptiles/openmaptiles-tools:${TOOLS_VERSION}"
command: postserve openmaptiles.yaml --verbose
env_file: .env
networks:
- postgres_conn
ports:
- "8090:8080"
- "8090:8090"
volumes:
- ./build/openmaptiles.tm2source:/mapping
- .:/tileset
networks:
postgres_conn: