From 1a66837f0d1092f4ce51de44cbfbdcc1907151a6 Mon Sep 17 00:00:00 2001
From: Thomas Sileo <t@a4.io>
Date: Mon, 22 Apr 2019 11:18:06 +0200
Subject: [PATCH] Improve the Makefile

---
 Makefile | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 60bc7c6..656a651 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ PYTHON=python
 SETUP_WIZARD_IMAGE=microblogpub-setup-wizard:latest
 PWD=$(shell pwd)
 
+# Build the config (will error if an existing config is found) via a Docker container
 .PHONY: config
 config:
 	# Build the container for the setup wizard on-the-fly
@@ -11,6 +12,7 @@ config:
 	# Finally, remove the tagged image
 	docker rmi $(SETUP_WIZARD_IMAGE)
 
+# Reload the federation test instances (for local dev)
 .PHONY: reload-fed
 reload-fed:
 	docker build . -t microblogpub:latest
@@ -19,18 +21,31 @@ reload-fed:
 	WEB_PORT=5006 CONFIG_DIR=./tests/fixtures/instance1/config docker-compose -p instance1 -f docker-compose-tests.yml up -d --force-recreate --build
 	WEB_PORT=5007 CONFIG_DIR=./tests/fixtures/instance2/config docker-compose -p instance2 -f docker-compose-tests.yml up -d --force-recreate --build
 
-.PHONY: poussetaches
-poussetaches:
-	git clone https://github.com/tsileo/poussetaches.git pt && cd pt && docker build . -t poussetaches:latest && cd - && rm -rf pt
-
+# Reload the local dev instance
 .PHONY: reload-dev
 reload-dev:
 	docker build . -t microblogpub:latest
 	docker-compose -f docker-compose-dev.yml up -d --force-recreate
 
-.PHONY: run
-run:
+# Build the poussetaches Docker image
+.PHONY: poussetaches
+poussetaches:
+	git clone https://github.com/tsileo/poussetaches.git pt && cd pt && docker build . -t poussetaches:latest && cd - && rm -rf pt
+
+# Build the microblogpub Docker image
+.PHONY: microblogpub
+microblogpub:
+	# Update microblog.pub
 	git pull
+	# Rebuild the Docker image
 	docker build . -t microblogpub:latest
+
+# Run the docker-compose project locally (will perform a update if the project is already running)
+.PHONY: run
+run: poussetaches microblogpub
+	# (poussetaches and microblogpub Docker image will updated)
+	# Update MongoDB
+	docker pull mongo
+	# Restart the project
 	docker-compose stop
 	docker-compose up -d --force-recreate --build