From eef775fda94e71040dc3aa7496d101d28a9926ca Mon Sep 17 00:00:00 2001
From: ImreSamu <ImreSamu@users.noreply.github.com>
Date: Tue, 6 Dec 2016 18:43:32 +0100
Subject: [PATCH] fix some `make` commands

---
 Makefile           | 14 ++++++++++++--
 docker-compose.yml |  4 ++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index ea2bd9a..10c3212 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ help:
 	@echo "  make import-osm-dev                  # start import-osm  /bin/bash terminal (imposm3)"
 	@echo "  make clean-docker                    # remove docker containers, PG data volume "
 	@echo "  make forced-clean-sql                # drop all PostgreSQL tables for clean environment "
+	@echo "  make docker-unnecessary-clean        # clean unnecessary docker image(s) and container(s)"
 	@echo "  make refresh-docker-images           # refresh openmaptiles docker images from Docker HUB"
 	@echo "  make remove-docker-images            # remove openmaptiles docker images"
 	@echo "  make pgclimb-list-views              # list PostgreSQL public schema views"
@@ -58,8 +59,17 @@ refresh-docker-images:
 	docker-compose pull --ignore-pull-failures
 
 remove-docker-images:
-	docker rmi -f $(docker images | grep "openmaptiles" | awk "{print \$3}")
-	docker rmi osm2vectortiles/mapbox-studio
+	@echo "Deleting all openmaptiles related docker image(s)..."
+	@docker-compose down
+	@docker images | grep "<none>" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi	
+	@docker images | grep "openmaptiles" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi
+	@docker images | grep "osm2vectortiles/mapbox-studio" | awk -F" " '{print $$3}' | xargs --no-run-if-empty docker rmi
+
+docker-unnecessary-clean:
+	@echo "Deleting unnecessary container(s)..."
+	@docker ps -a  | grep Exited | awk -F" " '{print $$1}' | xargs  --no-run-if-empty docker rm
+	@echo "Deleting unnecessary image(s)..."
+	@docker images | grep \<none\> | awk -F" " '{print $$3}' | xargs  --no-run-if-empty  docker rmi
 
 psql:
 	docker-compose run --rm import-osm /usr/src/app/psql.sh
diff --git a/docker-compose.yml b/docker-compose.yml
index 87c1e87..19c2a0a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,7 +25,7 @@ services:
     links:
     - postgres
   import-osm:
-    image: "openmaptiles/import-osm:0.2"
+    image: "openmaptiles/import-osm:latest"
     env_file: .env
     environment:
       DIFF_MODE: "false"
@@ -42,7 +42,7 @@ services:
     volumes:
      - ./build:/sql
   openmaptiles-tools:
-    image: "openmaptiles/openmaptiles-tools:0.2"
+    image: "openmaptiles/openmaptiles-tools:latest"
     env_file: .env
     links:
     - postgres