From db246df3d6e3c2e2ef0d8fa6a8aa2163c05dcd63 Mon Sep 17 00:00:00 2001
From: mitchell <mitchelljfsimon@gmail.com>
Date: Wed, 29 May 2019 08:02:04 -0700
Subject: [PATCH] Updates to docker-compose and machine create make command;
 using config overrides

---
 Makefile                | 21 ++++++++++-----------
 docker-compose.prod.yml |  8 ++++++++
 docker-compose.yml      |  7 ++++---
 3 files changed, 22 insertions(+), 14 deletions(-)
 create mode 100644 docker-compose.prod.yml

diff --git a/Makefile b/Makefile
index 216c3b3..d81ddee 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all build clean format test docker-build
+.PHONY: all build clean format test
 
 build: clean format
 	env CGO_ENABLED=0 go build -o ./bin/server ./cmd/server
@@ -11,32 +11,31 @@ clean:
 docker:
 	docker-compose build
 
+local:
+	docker-compose up -d
+
 up:
-	docker-compose up
+	docker-compose -f docker-compose.yml -f docker-compose.prod.yml up
 
 upd:
-	docker-compose up -d
+	docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d
 
 down:
 	docker-compose down
 
 machine-create-google:
 	docker-machine create --driver google \
-	    --google-address m-selfpass \
+	    --google-address selfpass \
 	    --google-project selfpass-241808 \
-	    --google-machine-type n1-standard-1 \
+	    --google-machine-type f1-micro \
 	    --google-machine-image https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-9-stretch-v20190514 \
+	    --google-username selfpass \
+	    --google-zone us-west1-c \
 	    selfpass01
 
 machine-rm:
 	docker-machine rm selfpass01
 
-machine-ssh:
-	docker-machine ssh selfpass01
-
-machine-env:
-	docker-machine env selfpass01
-
 format:
 	gofmt -w -s -l .
 
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
new file mode 100644
index 0000000..87cf068
--- /dev/null
+++ b/docker-compose.prod.yml
@@ -0,0 +1,8 @@
+version: "3.7"
+services:
+  redis:
+    volumes:
+      - "/home/selfpass/data:/data"
+  server:
+    entrypoint:
+      - server
diff --git a/docker-compose.yml b/docker-compose.yml
index 7fde9be..1fcc334 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,15 +2,16 @@ version: "3.7"
 services:
   redis:
     image: "redis:5.0.5"
+    restart: on-failure
     volumes:
       - "./data:/data"
   server:
     build: .
-    restart: always
-    ports:
-      - "8080:8080"
+    restart: on-failure
     entrypoint:
       - server
       - -v
+    ports:
+      - "8080:8080"
     depends_on:
       - redis