From 424a2ffc22ba1a6b85ea14fe84616d2c62872c24 Mon Sep 17 00:00:00 2001
From: jcwimer <jacob.wimer@gmail.com>
Date: Fri, 20 Nov 2015 13:01:14 +0000
Subject: [PATCH] A few more deploy changes

---
 ...mpose-prod.yml => docker-compose-prod-full-stack.yml} | 0
 deploy/docker-compose-prod-webapp.yml                    | 9 +++++++++
 deploy/server-deploy-prod.sh                             | 6 +++---
 3 files changed, 12 insertions(+), 3 deletions(-)
 rename deploy/{docker-compose-prod.yml => docker-compose-prod-full-stack.yml} (100%)
 create mode 100644 deploy/docker-compose-prod-webapp.yml

diff --git a/deploy/docker-compose-prod.yml b/deploy/docker-compose-prod-full-stack.yml
similarity index 100%
rename from deploy/docker-compose-prod.yml
rename to deploy/docker-compose-prod-full-stack.yml
diff --git a/deploy/docker-compose-prod-webapp.yml b/deploy/docker-compose-prod-webapp.yml
new file mode 100644
index 0000000..d416da1
--- /dev/null
+++ b/deploy/docker-compose-prod-webapp.yml
@@ -0,0 +1,9 @@
+app:
+  extends:
+    file: docker-compose-common.yml
+    service: app
+  links:
+    - db
+  restart: always
+  env_file: 
+    - ./prod.env
diff --git a/deploy/server-deploy-prod.sh b/deploy/server-deploy-prod.sh
index 4bef76e..4ec4ace 100755
--- a/deploy/server-deploy-prod.sh
+++ b/deploy/server-deploy-prod.sh
@@ -1,6 +1,6 @@
-if [ -z "$1" ]
+if [ -z "$2" ]
   then
-    echo "usage) server-deploy-prod.sh user@server"
+    echo "usage) server-deploy-prod.sh user@server docker-compose-file-name.yml"
     exit 1
 fi
 
@@ -18,5 +18,5 @@ docker kill $(docker ps -q)
 
 bash rails-prod.sh wrestlingdev
 cd deploy
-docker-compose -f docker-compose-prod.yml up -d
+docker-compose -f ${2} up -d
 '"
\ No newline at end of file