From ab87b78b4d84350abc43c5a32ce39d68c25f16ee Mon Sep 17 00:00:00 2001
From: Jacob Cody Wimer <jacob.wimer@gmail.com>
Date: Wed, 11 Jul 2018 14:06:22 +0000
Subject: [PATCH] Added build to test compose

---
 deploy/deploy-test.sh          | 4 ++--
 deploy/docker-compose-test.yml | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/deploy/deploy-test.sh b/deploy/deploy-test.sh
index d6ab59b..adab91b 100755
--- a/deploy/deploy-test.sh
+++ b/deploy/deploy-test.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
 
-docker build -t wrestlingdev:test -f ${project_dir}/deploy/rails-prod-Dockerfile ${project_dir}
+#docker build -t wrestlingdev:test -f ${project_dir}/deploy/rails-prod-Dockerfile ${project_dir}
 docker-compose -f ${project_dir}/deploy/docker-compose-test.yml kill
-#docker-compose -f ${project_dir}/deploy/docker-compose-test.yml pull
+docker-compose -f ${project_dir}/deploy/docker-compose-test.yml build
 docker-compose -f ${project_dir}/deploy/docker-compose-test.yml up -d
 echo Make sure your local mysql database has a wrestlingtourney db
diff --git a/deploy/docker-compose-test.yml b/deploy/docker-compose-test.yml
index e7ef11b..35403b8 100644
--- a/deploy/docker-compose-test.yml
+++ b/deploy/docker-compose-test.yml
@@ -9,6 +9,9 @@ volumes:
 services:
   app:
     image: wrestlingdev:dev
+    build:
+      context: ../
+      dockerfile: rails-prod-Dockerfile
     environment:
       - WRESTLINGDEV_DB_NAME=wrestlingtourney
       - WRESTLINGDEV_DB_USR=root
@@ -60,6 +63,9 @@ services:
 
   worker:
     image: wrestlingdev:dev
+    build:
+      context: ../
+      dockerfile: rails-prod-Dockerfile
     environment:
       - WRESTLINGDEV_DB_NAME=wrestlingtourney
       - WRESTLINGDEV_DB_USR=root