Merge pull request #8 from MartinMikita/configjson

Configurable path for config.json
openmaptiles · Feb 5, 2017 · a043f13 · a043f13
2 parents 62ee756 + 7e79d6a
commit a043f13
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -47,7 +47,8 @@ ENV IMPORT_DIR=/import \
     IMPOSM_CACHE_DIR=/cache \
     MAPPING_YAML=/mapping/mapping.yaml \
     DIFF_DIR=/import \
-    TILES_DIR=/import
+    TILES_DIR=/import \
+    CONFIG_JSON=config.json
 
 WORKDIR /usr/src/app
 COPY . /usr/src/app/

diff --git a/import_diff.sh b/import_diff.sh
@@ -13,7 +13,7 @@ function import_diff() {
         -diffdir "$IMPORT_DIR" \
         -expiretiles-dir "$IMPORT_DIR" \
         -expiretiles-zoom 14 \
-        -config config.json "$IMPORT_DIR/changes.osc.gz"
+        -config $CONFIG_JSON "$IMPORT_DIR/changes.osc.gz"
 }
 
 import_diff
diff --git a/import_update.sh b/import_update.sh
@@ -13,7 +13,7 @@ function update() {
         -diffdir "$DIFF_DIR" \
         -expiretiles-dir "$TILES_DIR" \
         -expiretiles-zoom 14 \
-        -config config.json
+        -config $CONFIG_JSON
 }
 
 update