Merge branch 'development'

app/views/layouts/_footer.html.erb

@@ -5,8 +5,8 @@
   </small>
   <br>
   <small>
-    &copy; 2015 wrestlingdev.com
+    &copy; <%= Time.now.year %>  wrestlingdev.com
   </small>
-  
+
 </footer>
-    
+

bin/fix-permissions.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
+
+USERNAME=$USER
+sudo chown -R ${USERNAME}:${USERNAME} ${project_dir}/.
+sudo chmod -R 774 ${project_dir}/.

bin/rails-dev-db-create.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
+
+cd ${project_dir}
+rake db:setup
+rake db:migrate RAILS_ENV=test

bin/rails-dev-run.sh

@@ -0,0 +1,10 @@
+#!/bin/bash -e
+project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
+
+if [ $# != 1 ]; then
+  echo "Please enter docker image name for the rails development environment"
+  exit 1
+fi
+
+docker build -t $1 -f ${project_dir}/deploy/rails-dev-Dockerfile ${project_dir}
+docker run -it -p 3000:3000 -v ${project_dir}:/rails $1 /bin/bash

bin/run-all-tests.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
+
+cd ${project_dir}
+rake db:migrate RAILS_ENV=test
+rake test

bin/tmux.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
+
+cd ${project_dir}
 CURRENT_SESSION=wrestlingdev
 tmux new-session -d -s $CURRENT_SESSION
 tmux send-keys 'vim' 'C-m'
@@ -6,7 +9,8 @@ tmux send-keys ':NERDTree' 'C-m'
 tmux rename-window rails-vim
 tmux new-window
 tmux rename-window rails
-tmux send-keys 'bash rails-dev.sh wrestlingdev' 'C-m'
+tmux send-keys 'bash bin/rails-dev-run.sh wrestlingdev' 'C-m'
+tmux send-keys 'bash bin/rails-dev-db-create.sh' 'C-m'
 tmux new-window
 tmux rename-window rails-git
 tmux select-window -t 0

deploy/deploy-prod.sh

@@ -1,8 +1,11 @@
-gpg prod.env.gpg
+#!/bin/bash
-cd ..
+project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
-bash rails-prod.sh wrestlingdev
+
-cd deploy
+gpg --output ${project_dir}/deploy/prod.env --decrypt ${project_dir}/deploy/prod.env.gpg
-docker-compose -f docker-compose-prod-full-stack.yml up -d
+docker build -t wrestlingdev-prod -f ${project_dir}/deploy/rails-prod-Dockerfile ${project_dir}
+docker-compose -f ${project_dir}/deploy/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"
+
+rm ${project_dir}/deploy/prod.env

deploy/deploy-test.sh

@@ -1,6 +1,7 @@
-cd ..
+#!/bin/bash
-docker build -t wrestlingdev -f rails-prod-Dockerfile .
+project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
-cd deploy
+
-docker-compose -f docker-compose-test.yml kill
+docker build -t wrestlingdev -f ${project_dir}/deploy/rails-prod-Dockerfile ${project_dir}
-docker-compose -f docker-compose-test.yml up -d
+docker-compose -f ${project_dir}/deploy/docker-compose-test.yml kill
+docker-compose -f ${project_dir}/deploy/docker-compose-test.yml up -d
 echo Make sure your local mysql database has a wrestlingtourney db

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

@@ -2,29 +2,31 @@ app:
   extends:
     file: docker-compose-common.yml
     service: app
+  image: wrestlingdev-prod
   links:
     - db
   restart: always
-  env_file: 
+  env_file:
     - ./prod.env
 db:
   extends:
     file: docker-compose-common.yml
     service: db
   restart: always
-  env_file: 
+  env_file:
     - ./prod.env
 worker:
   extends:
     file: docker-compose-common.yml
     service: worker
+  image: wrestlingdev-prod
   links:
     - db
   restart: always
-  env_file: 
+  env_file:
     - ./prod.env
   command: bundle exec rake jobs:work RAILS_ENV=production
-  
+
 memcached:
   extends:
     file: docker-compose-common.yml

deploy/rails-prod-Dockerfile

@@ -1,6 +1,7 @@
 FROM ruby:2.4.2
 
 RUN apt-get -qq update \
+  && DEBIAN_FRONTEND=noninteractive apt-get -qq upgrade -y \
   && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y \
     build-essential \
     libssl-dev \

deploy/rails-prod-create-image.sh

@@ -1,16 +1,14 @@
 #!/bin/bash -e
-docker pull ruby:2.2.3
+project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
-
 if [ $# != 1 ]; then
   echo "Please enter docker image name for the rails development environment"
   exit 1
 fi
 
-docker build -t $1 -f rails-prod-Dockerfile .
+docker build -t $1 -f ${project_dir}/deploy/rails-prod-Dockerfile ${project_dir}/.
 
 #Kill and remove containers gracefully without error if none are running
 docker ps | grep "Exit" | awk '{print $1}' | while read -r id ; do
   docker kill $id
 done
 
-docker run -h $HOSTNAME -d --restart=always --env-file $WRESTLINGDEV_ENV_FILE  -v /etc/localtime:/etc/localtime -p 80:80 -p 443:443 $1

fix-permissions.sh

@@ -1,3 +0,0 @@
-USERNAME=$USER
-sudo chown -R ${USERNAME}:${USERNAME} .
-sudo chmod -R 774 .

rails-dev-db.sh

@@ -1,2 +0,0 @@
-rake db:setup
-rake db:migrate RAILS_ENV=test

rails-dev.sh

@@ -1,11 +0,0 @@
-#!/bin/bash -e
-
-if [ $# != 1 ]; then
-  echo "Please enter docker image name for the rails development environment"
-  exit 1
-fi
-
-APPPATH="$(pwd)"
-
-docker build -t $1 -f rails-dev-Dockerfile .
-docker run -it -p 3000:3000 -v ${APPPATH}:/rails $1 /bin/bash

rails-worker-prod.sh

@@ -1,16 +0,0 @@
-#!/bin/bash -e
-docker pull ruby:2.2.3
-
-if [ $# != 1 ]; then
-  echo "Please enter docker image name for the rails development environment"
-  exit 1
-fi
-
-docker build -t $1 -f rails-prod-Dockerfile .
-
-#Kill and remove containers gracefully without error if none are running
-docker ps | grep "Exit" | awk '{print $1}' | while read -r id ; do
-  docker kill $id
-done
-
-docker run -h $HOSTNAME -d --restart=always --env-file $WRESTLINGDEV_ENV_FILE -v /etc/localtime:/etc/localtime $1 bundle exec rake jobs:work RAILS_ENV=production

run-all-tests.sh

@@ -1,2 +0,0 @@
-rake db:migrate RAILS_ENV=test
-rake test