From 32e84bfcba43103c9f16e1cb7e3045b1b4f5e9f1 Mon Sep 17 00:00:00 2001
From: "Cormier, Jonathan" <jjcf89@gmail.com>
Date: Fri, 29 Apr 2016 20:51:39 -0400
Subject: [PATCH 1/3] docker: Make docker container name match README

---
 docker/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Makefile b/docker/Makefile
index 85d4ac1..fbf7f2b 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -11,4 +11,4 @@ build:
 	docker build -t factorio-server-manager .
 
 run:
-	docker run -d --name factorio-server-manager -v $(SECURITY_PATH):/security -v $(SAVES_PATH):/opt/factorio/saves -v $(MODS_PATH):/opt/factorio/mods $(PORT_FORWARD) -e ADMIN_PASSWORD=$(ADMIN_PASS) factorio-server-manager
+	docker run -d --name factorio-server -v $(SECURITY_PATH):/security -v $(SAVES_PATH):/opt/factorio/saves -v $(MODS_PATH):/opt/factorio/mods $(PORT_FORWARD) -e ADMIN_PASSWORD=$(ADMIN_PASS) factorio-server-manager

From 95f0896a9478a13a4122a734cc86a6e1de02c98e Mon Sep 17 00:00:00 2001
From: "Cormier, Jonathan" <jjcf89@gmail.com>
Date: Fri, 29 Apr 2016 20:58:28 -0400
Subject: [PATCH 2/3] docker: Add logs, stop, and clean to Makefile

---
 docker/Makefile | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docker/Makefile b/docker/Makefile
index fbf7f2b..1947308 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -10,5 +10,15 @@ PORT_FORWARD ?= -p 80:80 -p 443:443 -p 34197:34197/udp
 build:
 	docker build -t factorio-server-manager .
 
+logs:
+	docker logs factorio-server
+
 run:
 	docker run -d --name factorio-server -v $(SECURITY_PATH):/security -v $(SAVES_PATH):/opt/factorio/saves -v $(MODS_PATH):/opt/factorio/mods $(PORT_FORWARD) -e ADMIN_PASSWORD=$(ADMIN_PASS) factorio-server-manager
+
+stop:
+	docker stop factorio-server
+	docker rm factorio-server
+
+clean:
+	docker rmi factorio-server-manager

From 32c9c53acc27179e3a7c9cfca40864be172ce179 Mon Sep 17 00:00:00 2001
From: "Cormier, Jonathan" <jjcf89@gmail.com>
Date: Fri, 29 Apr 2016 23:38:55 -0400
Subject: [PATCH 3/3] docker: Add nginx logs to Makefile log target

---
 docker/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker/Makefile b/docker/Makefile
index 1947308..5352bce 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -12,6 +12,10 @@ build:
 
 logs:
 	docker logs factorio-server
+	echo "Nginx Access Logs"
+	docker exec -it factorio-server cat /var/log/nginx/access.log
+	echo "Nginx Error Logs"
+	docker exec -it factorio-server cat /var/log/nginx/error.log
 
 run:
 	docker run -d --name factorio-server -v $(SECURITY_PATH):/security -v $(SAVES_PATH):/opt/factorio/saves -v $(MODS_PATH):/opt/factorio/mods $(PORT_FORWARD) -e ADMIN_PASSWORD=$(ADMIN_PASS) factorio-server-manager