From 994882a21f247991dde4373af09e8a78bb0335ca Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Fri, 16 Feb 2018 10:46:16 +0100
Subject: [PATCH] upd: makefile,readme +added proper log/lock files +added
 'make log' +added 'make tty'

---
 Makefile  | 40 ++++++++++++++++++++++++++++++----------
 README.md |  5 ++++-
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index d804f9b..68ec261 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 IMAGE_NAME="alp-mdb"
 CONTAINER_NAME="inst1"
+LOG="/tmp/ptut.virtenv.log"
+LOCK="/tmp/ptut.virtenv.lock"
 
 image: build
 	@echo -n "> Building image...............";
@@ -26,15 +28,33 @@ kill:
 	@docker exec -ti inst1 sh -c 'rm boot.lock';
 
 boot:
+	@echo -e "/!\\ 'make log' for real-time log\n";
+	@touch $(LOG);
 	@while true; do \
-		echo "*** 1. Updating virtual environment"; \
-		git pull; \
-		echo "*** 2. Building image"; \
-		make image; \
-		echo "*** 3. Launching container"; \
-		docker run --name $(CONTAINER_NAME) $(IMAGE_NAME); \
-		echo "*** 4. Deleting container"; \
-		docker stop $(CONTAINER_NAME); \
-		docker rm -flv $(CONTAINER_NAME); \
+		echo "*** 1. Updating virtual environment" | tee -a $(LOG); \
+		git pull origin master >> $(LOG) 2>&1; true; \
+		echo "*** 2. Building image" | tee -a $(LOG); \
+		make image >>  $(LOG) 2>&1; \
+		echo "*** 3. Launching container" | tee -a $(LOG); \
+		touch $(LOCK); \
+		docker run --name $(CONTAINER_NAME) $(IMAGE_NAME) >> $(LOG) 2>&1; \
+		echo "*** 4. Deleting container" | tee -a; \
+		docker stop $(CONTAINER_NAME) >> $(LOG) 2>&1; true; \
+		docker rm -flv $(CONTAINER_NAME) >> $(LOG) 2>&1; true; \
+		rm $(LOCK); \
 		sleep 2; \
-	done;
\ No newline at end of file
+	done;
+
+log:
+	@echo -n "> Checking log file.......";
+	@test -f $(LOG) && echo "found" || (echo "missing"; exit 1);
+	@echo -n "> Checking container......";
+	@test -f $(LOCK) && echo "running" || echo "not running";
+	@echo "====== LOG ======";
+	@tail -f $(LOG);
+
+tty:
+	@echo -n "> Checking lock...........";
+	@test -f $(LOCK) && echo "found" || (echo "missing"; exit 1);
+	@echo "> Connecting tty.............";
+	@docker exec -ti $(CONTAINER_NAME) sh;
diff --git a/README.md b/README.md
index e36982a..3f840ac 100644
--- a/README.md
+++ b/README.md
@@ -64,4 +64,7 @@ make boot
 	1. Updates the git repository (*git pull*)
 	2. Builds the image (*make image*)
 	3. Launches the container (*make run*)
-	4. When the container stops, delete it and reloop
\ No newline at end of file
+	4. When the container stops, delete it and reloop
+
+- to have a real time log, launch `make log`
+- to connect to a tty launch `make tty`
\ No newline at end of file