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

Use new import-data image (#818)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile
View File

@@ -69,7 +69,9 @@ help:
.PHONY: init-dirs
init-dirs:
mkdir -p build && mkdir -p data && mkdir -p cache
@mkdir -p build
@mkdir -p data
@mkdir -p cache
build/openmaptiles.tm2source/data.yml: init-dirs
mkdir -p build/openmaptiles.tm2source
@@ -94,12 +96,13 @@ clean-docker:
.PHONY: db-start
db-start:
$(DOCKER_COMPOSE) up -d postgres
$(DOCKER_COMPOSE) up --no-recreate -d postgres
@echo "Wait for PostgreSQL to start..."
$(DOCKER_COMPOSE) run $(DC_OPTS) import-osm ./pgwait.sh
.PHONY: db-stop
db-stop:
@echo "Stopping PostgreSQL..."
$(DOCKER_COMPOSE) stop postgres
OSM_SERVERS:=geofabrik osmfr bbbike
@@ -142,22 +145,14 @@ import-sql: db-start all
.PHONY: import-osmsql
import-osmsql: db-start all import-osm import-sql
.PHONY: import-data
import-data: db-start
$(DOCKER_COMPOSE) run $(DC_OPTS) import-data
.PHONY: import-borders
import-borders: db-start
$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools import-borders
.PHONY: import-water
import-water: db-start
$(DOCKER_COMPOSE) run $(DC_OPTS) import-water
.PHONY: import-natural-earth
import-natural-earth: db-start
$(DOCKER_COMPOSE) run $(DC_OPTS) import-natural-earth
.PHONY: import-lakelines
import-lakelines: db-start
$(DOCKER_COMPOSE) run $(DC_OPTS) import-lakelines
.PHONY: generate-tiles
ifneq ($(wildcard data/docker-compose-config.yml),)
DC_CONFIG_TILES:=-f docker-compose.yml -f ./data/docker-compose-config.yml
@@ -219,7 +214,7 @@ generate-qareports:
.PHONY: generate-devdoc
generate-devdoc: init-dirs
mkdir -p ./build/devdoc && \
$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools-latest sh -c \
$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools sh -c \
'generate-etlgraph openmaptiles.yaml $(GRAPH_PARAMS) && \
generate-mapping-graph openmaptiles.yaml $(GRAPH_PARAMS)'