From f61415c464d285f21861a2df337b04bbd403543e Mon Sep 17 00:00:00 2001
From: jirik <jirik@users.noreply.github.com>
Date: Tue, 25 Jul 2017 17:38:37 +0200
Subject: [PATCH] Use specific omt-tools

---
 docker-compose.yml | 2 +-
 quickstart.sh      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index fec7f1df..7809dbdf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -75,7 +75,7 @@ services:
     volumes:
      - ./build:/sql
   openmaptiles-tools:
-    image: "openmaptiles/openmaptiles-tools:latest"
+    image: "openmaptiles/openmaptiles-tools:v0.2"
     env_file: .env
     networks:
     - postgres_conn
diff --git a/quickstart.sh b/quickstart.sh
index 947a3096..d6aab05c 100755
--- a/quickstart.sh
+++ b/quickstart.sh
@@ -51,7 +51,7 @@ echo "      : Your docker system:"
 docker         --version
 docker-compose --version
 
-# based on: http://stackoverflow.com/questions/16989598/bash-comparing-version-numbers 
+# based on: http://stackoverflow.com/questions/16989598/bash-comparing-version-numbers
 function version { echo "$@" | tr -cs '0-9.' '.' | gawk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }'; }
 
 COMPOSE_VER=$(docker-compose version --short)
@@ -166,14 +166,14 @@ fi
 echo " "
 echo "-------------------------------------------------------------------------------------"
 echo "====> : Remove old generated source files ( ./build/* ) ( if they exist ) "
-docker run --rm -v $(pwd):/tileset openmaptiles/openmaptiles-tools make clean
+docker-compose run --rm openmaptiles-tools make clean
 
 echo " "
 echo "-------------------------------------------------------------------------------------"
 echo "====> : Code generating from the layer definitions ( ./build/mapping.yaml; ./build/tileset.sql )"
 echo "      : The tool source code: https://github.com/openmaptiles/openmaptiles-tools "
 echo "      : But we generate the tm2source, Imposm mappings and SQL functions from the layer definitions! "
-docker run --rm -v $(pwd):/tileset openmaptiles/openmaptiles-tools make
+docker-compose run --rm openmaptiles-tools make
 
 echo " "
 echo "-------------------------------------------------------------------------------------"
@@ -261,7 +261,7 @@ echo " "
 echo "-------------------------------------------------------------------------------------"
 echo "====> : Add special metadata to mbtiles! "
 docker-compose run --rm openmaptiles-tools  generate-metadata ./data/tiles.mbtiles
-docker-compose run --rm openmaptiles-tools  chmod 666         ./data/tiles.mbtiles	
+docker-compose run --rm openmaptiles-tools  chmod 666         ./data/tiles.mbtiles
 
 echo " "
 echo "-------------------------------------------------------------------------------------"