From 2c9e27a695dd55af1a3dc960850aae8f82641eb9 Mon Sep 17 00:00:00 2001
From: MartinMikita <martin.mikita@klokantech.com>
Date: Tue, 21 Mar 2017 16:56:33 +0100
Subject: [PATCH 1/2] Updated versions of docker images in docker-compose:  -
 import-osm:0.4  - import-water:0.3  - generate-vectortiles:0.1.1 Use same
 version of import-osm in update-osm and import-osm-diff containers.

---
 docker-compose.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 20d926f..13ea1ad 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ services:
     networks:
     - postgres_conn
   import-water:
-    image: "openmaptiles/import-water:0.2"
+    image: "openmaptiles/import-water:0.3"
     env_file: .env
     networks:
     - postgres_conn
@@ -28,7 +28,7 @@ services:
     networks:
     - postgres_conn
   import-osm:
-    image: "openmaptiles/import-osm:0.3"
+    image: "openmaptiles/import-osm:0.4"
     env_file: .env
     environment:
       DIFF_MODE: ${DIFF_MODE}
@@ -44,7 +44,7 @@ services:
     networks:
     - postgres_conn
   import-osm-diff:
-    image: "openmaptiles/import-osm:latest"
+    image: "openmaptiles/import-osm:0.4"
     env_file: .env
     command: ./import_diff.sh
     environment:
@@ -56,7 +56,7 @@ services:
      - ./build:/mapping
      - cache:/cache
   update-osm:
-    image: "openmaptiles/import-osm:latest"
+    image: "openmaptiles/import-osm:0.4"
     env_file: .env
     environment:
       DIFF_MODE: ${DIFF_MODE}
@@ -91,7 +91,7 @@ services:
     ports:
      - "3000:3000"
   generate-changed-vectortiles:
-    image: "openmaptiles/generate-vectortiles:0.1"
+    image: "openmaptiles/generate-vectortiles:0.1.1"
     command: ./export-list.sh
     volumes:
     - ./data:/export
@@ -100,7 +100,7 @@ services:
     - postgres_conn
     env_file: .env
   generate-vectortiles:
-    image: "openmaptiles/generate-vectortiles:0.1"
+    image: "openmaptiles/generate-vectortiles:0.1.1"
     volumes:
     - ./data:/export
     - ./build/openmaptiles.tm2source:/tm2source

From 62526dd267fef3278598099b840ae1d314c96ef2 Mon Sep 17 00:00:00 2001
From: MartinMikita <martin.mikita@klokantech.com>
Date: Tue, 21 Mar 2017 18:42:02 +0100
Subject: [PATCH 2/2] Fixed typo in import-water docker repository - increase
 version to 0.3.1

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 13ea1ad..fec7f1d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ services:
     networks:
     - postgres_conn
   import-water:
-    image: "openmaptiles/import-water:0.3"
+    image: "openmaptiles/import-water:0.3.1"
     env_file: .env
     networks:
     - postgres_conn