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

Compare commits

base: cerxes:last-used
Branches Tags
cerxes:master cerxes:2025-refresh cerxes:last-used
...
compare: cerxes:0cee7fd6fc41adf3135e5f089e810a1cba7e8e2a
Branches Tags
cerxes:2025-refresh cerxes:master cerxes:last-used

2 Commits
last-used ... 0cee7fd6fc

Author SHA1 Message Date
Miel Truyen
0cee7fd6fc Make DC User and Password configurable 2020-07-01 14:45:12 +02:00
Miel Truyen
5208f1adbd Make DC User and Password configurable 2020-07-01 14:41:18 +02:00
1 changed files with 4 additions and 1 deletions
Expand all files Collapse all files

5
Makefile
View File

@@ -6,6 +6,9 @@ SHELL = /bin/bash
# Containers run as the current user rather than root (so that created files are not root-owned) # Containers run as the current user rather than root (so that created files are not root-owned)
DC_OPTS?=--rm -u $(shell id -u):$(shell id -g) DC_OPTS?=--rm -u $(shell id -u):$(shell id -g)
DC_USER?="openmaptiles"
DC_PASSWORD?="openmaptiles"
# If set to a non-empty value, will use postgis-preloaded instead of postgis docker image # If set to a non-empty value, will use postgis-preloaded instead of postgis docker image
USE_PRELOADED_IMAGE?= USE_PRELOADED_IMAGE?=
@@ -101,7 +104,7 @@ init-dirs:
build/openmaptiles.tm2source/data.yml: init-dirs build/openmaptiles.tm2source/data.yml: init-dirs
mkdir -p build/openmaptiles.tm2source mkdir -p build/openmaptiles.tm2source
$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools generate-tm2source openmaptiles.yaml --host="postgres" --port=5432 --database="openmaptiles" --user="openmaptiles" --password="openmaptiles" > $@ $(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools generate-tm2source openmaptiles.yaml --host="postgres" --port=5432 --database="openmaptiles" --user="$(DC_USER)" --password="$(DC_PASSWORD)" > $@
build/mapping.yaml: init-dirs build/mapping.yaml: init-dirs
$(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools generate-imposm3 openmaptiles.yaml > $@ $(DOCKER_COMPOSE) run $(DC_OPTS) openmaptiles-tools generate-imposm3 openmaptiles.yaml > $@