From 4f7e5027aba165626be26233375653ed9774be8d Mon Sep 17 00:00:00 2001
From: Chris Sng <chrissng@users.noreply.github.com>
Date: Fri, 2 Feb 2018 13:44:33 +0800
Subject: [PATCH] use env file everywhere (#3)

- as documented in https://github.com/openmaptiles/openmaptiles/blob/f591f2e28efd377f529cfbae3a89e55c0d0bff2c/QUICKSTART.md#change-min_zoom-and-max_zoom
- empty docker-compose-config.yml
---
 .env                      | 12 ++++++++++++
 build.sh                  |  1 +
 docker-compose-config.yml | 12 +-----------
 3 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 .env

diff --git a/.env b/.env
new file mode 100644
index 0000000..996004b
--- /dev/null
+++ b/.env
@@ -0,0 +1,12 @@
+POSTGRES_DB=openmaptiles
+POSTGRES_USER=openmaptiles
+POSTGRES_PASSWORD=openmaptiles
+POSTGRES_HOST=postgres
+POSTGRES_PORT=5432
+QUICKSTART_MIN_ZOOM=0
+QUICKSTART_MAX_ZOOM=18
+DIFF_MODE=false
+BBOX=103.062,0.807,104.545,1.823
+OSM_AREA_NAME=Singapore Metro Area
+MIN_ZOOM=0
+MAX_ZOOM=18
diff --git a/build.sh b/build.sh
index d04ed2d..00eb9f3 100755
--- a/build.sh
+++ b/build.sh
@@ -7,6 +7,7 @@ mkdir -p data
 echo "====> : Downloading Singapore Metro Extract"
 curl https://s3.amazonaws.com/metro-extracts.mapzen.com/singapore.osm.pbf -o data/singapore.osm.pbf
 
+cp ../.env .env
 cp ../docker-compose-config.yml data/docker-compose-config.yml
 
 ./quickstart.sh singapore
diff --git a/docker-compose-config.yml b/docker-compose-config.yml
index 216c025..d641b01 100644
--- a/docker-compose-config.yml
+++ b/docker-compose-config.yml
@@ -1,11 +1 @@
-version: "2"
-services:
-  generate-vectortiles:
-    environment:
-      DIFF_MODE: "false"
-      BBOX: "103.062,0.807,104.545,1.823"
-      OSM_AREA_NAME: "Singapore Metro Area"
-      QUICKSTART_MIN_ZOOM: "0"
-      QUICKSTART_MAX_ZOOM: "18"
-      MIN_ZOOM: "0"
-      MAX_ZOOM: "18"
+version: "2"