Specified ruby 2.3.0

deploy/deploy-prod.sh

@@ -2,7 +2,7 @@ gpg prod.env.gpg
 cd ..
 bash rails-prod.sh wrestlingdev
 cd deploy
-docker-compose -f docker-compose-prod.yml up -d
-echo Make sure your local mysql database has a db for wrestlingdev
+docker-compose -f docker-compose-prod-full-stack.yml up -d
+echo Make sure your local mysql database has a db for wrestlingdev called wrestlingtourney
 echo "mysqldump -u guy -ppassword -h host database_name > database.sql"
 echo "mysql -u guy -ppassword -h host database_name < database.sql"

deploy/docker-compose-common.yml

@@ -19,3 +19,7 @@ email:
 memcached:
   image: memcached
   mem_limit: 64000000
+  
+worker:
+  image: wrestlingdev
+  command: /bin/bash -c "cd /var/www && bundle exec rake jobs:work RAILS_ENV=production"

deploy/docker-compose-prod-full-stack.yml

@@ -14,3 +14,12 @@ db:
   restart: always
   env_file: 
     - ./prod.env
+worker:
+  extends:
+    file: docker-compose-common.yml
+    service: worker
+  links:
+    - db
+  restart: always
+  env_file: 
+    - ./prod.env

deploy/docker-compose-prod-webapp.yml

@@ -1,9 +0,0 @@
-app:
-  extends:
-    file: docker-compose-common.yml
-    service: app
-  links:
-    - db
-  restart: always
-  env_file: 
-    - ./prod.env

deploy/docker-compose-test.yml

@@ -21,3 +21,19 @@ db:
   environment:
     - MYSQL_ROOT_PASSWORD=password
   restart: always
+worker:
+  extends:
+    file: docker-compose-common.yml
+    service: worker
+  environment:
+    - WRESTLINGDEV_DB_NAME=wrestlingtourney
+    - WRESTLINGDEV_DB_USR=root
+    - WRESTLINGDEV_DB_PWD=password
+    - WRESTLINGDEV_DB_HOST=db
+    - WRESTLINGDEV_DB_PORT=3306
+    - WRESTLINGDEV_DEVISE_SECRET_KEY=2f29d49db6704377ba263f7cb9db085b386bcb301c0cd501126a674686ab1a109754071165b08cd72af03cec4642a4dd04361c994462254dd5d85e9594e8b9aa
+    - WRESTLINGDEV_SECRET_KEY_BASE=077cdbef5c2ccf22543fb17a67339f234306b7fa2e1e4463d851c444c10a5611829a2290b253da78339427f131571fac9a42c83d960b2d25ecc10a4a0a7ce1a2
+
+  links:
+    - db
+  restart: always

deploy/server-deploy-prod.sh

@@ -1,22 +0,0 @@
-if [ -z "$2" ]
-  then
-    echo "usage) server-deploy-prod.sh user@server docker-compose-file-name.yml"
-    exit 1
-fi
-
-echo "Copying your ssh key to ${1}"
-ssh-copy-id $1
-clear
-ssh -t $1 bash -c "'
-cd wrestlingApp
-mv deploy/prod.env ../
-git pull origin master
-mv ../prod.env deploy/
-
-#Kill all containers
-docker kill $(docker ps -q)
-
-bash rails-prod.sh wrestlingdev
-cd deploy
-docker-compose -f ${2} up -d
-'"