From 0f9beddeb5f5ef49667fba4991766f368f8883b7 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Fri, 16 Feb 2018 10:24:16 +0100
Subject: [PATCH] upd: makefile +added run ~renamed Dockerfile->build ~renamed
 build->image *fixed things

---
 Makefile | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 7d86729..d804f9b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,35 +1,40 @@
 IMAGE_NAME="alp-mdb"
+CONTAINER_NAME="inst1"
 
-build: clean Dockerfile
+image: build
 	@echo -n "> Building image...............";
 	docker build --force-rm -t $(IMAGE_NAME) . && echo "done" || echo "error";
 
-Dockerfile: docker/main docker/include/*
+build: docker/main docker/include/*
 	@echo -n "> Building file Dockerfile.....";
 	@cpp -o Dockerfile docker/main && echo "done" || echo "error";
 
 clean:
 	@echo -n "> Stopping containers..........";
-	@docker stop inst1;
-	@docker rm -flv inst1;
+	@docker stop $(CONTAINER_NAME); true;
+	@docker rm -flv $(CONTAINER_NAME); true;
 	@echo -n "> Deleting docker image........";
-	@docker rmi -f $(IMAGE_NAME) && echo "done" || echo "failed";
+	@docker rmi -f $(IMAGE_NAME) && echo "done" || echo "failed"; true
 	@echo -n "> Deleting Dockerfile..........";
-	@rm Dockerfile && echo "done" || echo "failed";
+	@rm Dockerfile && echo "done" || echo "failed"; true
+
+run: image
+	@echo "> Launching the container";
+	docker run --name $(CONTAINER_NAME) $(IMAGE_NAME);
+
+kill:
+	@docker exec -ti inst1 sh -c 'rm boot.lock';
 
 boot:
 	@while true; do \
 		echo "*** 1. Updating virtual environment"; \
-		git pull origin stable; \
+		git pull; \
 		echo "*** 2. Building image"; \
-		make build; \
+		make image; \
 		echo "*** 3. Launching container"; \
-		docker run --name inst1 $(IMAGE_NAME); \
+		docker run --name $(CONTAINER_NAME) $(IMAGE_NAME); \
 		echo "*** 4. Deleting container"; \
-		docker stop inst1; \
-		docker rm -flv inst1; \
+		docker stop $(CONTAINER_NAME); \
+		docker rm -flv $(CONTAINER_NAME); \
 		sleep 2; \
-	done;
-
-kill:
-	@docker exec -ti inst1 sh -c 'rm boot.lock';
\ No newline at end of file
+	done;
\ No newline at end of file