Moved files out of the root of the project to bin and deploy where they belong

deploy/deploy-prod.sh

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

@@ -0,0 +1,33 @@
+FROM ruby:2.4.2
+
+RUN apt-get -qq update \
+  && apt-get -qq install -y \
+    build-essential \
+    sqlite3 \
+    nodejs \
+  && apt-get -qq clean \
+  && rm -rf \
+    /var/lib/apt/lists/* \
+    /tmp/* \
+    /var/tmp/*
+
+# Set timezone inside the container
+RUN echo "America/New_York" > /etc/timezone \
+ && rm /etc/localtime \
+ && ln -s /usr/share/zoneinfo/America/New_York /etc/localtime
+
+RUN gem install --no-rdoc --no-ri bundler
+ADD Gemfile* /tmp/
+WORKDIR /tmp
+RUN bundle install --without production
+
+RUN mkdir /rails
+WORKDIR /rails
+
+ADD . /rails
+
+VOLUME ["/rails"]
+
+EXPOSE 3000
+
+CMD /bin/bash

deploy/rails-prod-Dockerfile

@@ -0,0 +1,69 @@
+FROM ruby:2.4.2
+
+RUN apt-get -qq update \
+  && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y \
+    build-essential \
+    libssl-dev \
+    libyaml-dev \
+    libreadline-dev \
+    openssl \
+    curl \
+    git-core \
+    zlib1g-dev \
+    bison \
+    libxml2-dev \
+    libxslt1-dev \
+    libcurl4-openssl-dev \
+    libsqlite3-dev \
+    sqlite3 \
+    wget \
+    apt-transport-https \
+    mysql-client \
+    postfix \
+    nodejs \
+  && apt-get -qq clean \
+  && rm -rf \
+    /var/lib/apt/lists/* \
+    /tmp/* \
+    /var/tmp/*
+
+# Set timezone inside the container
+RUN echo "America/New_York" > /etc/timezone \
+ && rm /etc/localtime \
+ && ln -s /usr/share/zoneinfo/America/New_York /etc/localtime
+
+#New Relic
+#RUN echo deb http://apt.newrelic.com/debian/ newrelic non-free >> /etc/apt/sources.list.d/newrelic.list \
+# && wget -O- https://download.newrelic.com/548C16BF.gpg | apt-key add - \
+# && apt-get update \
+# && apt-get install newrelic-sysmond -y \
+# && nrsysmond-config --set license_key=$NEW_RELIC_LICENSE_KEY
+
+#SSL
+RUN mkdir /ssl \
+  && openssl req -sha256 -subj '/CN=home/O=home LTD./C=US' \
+    -x509 -nodes -days 365 -newkey rsa:4096 -keyout /ssl/server.key -out /ssl/server.crt
+
+EXPOSE 80
+EXPOSE 443
+
+RUN gem install --no-rdoc --no-ri bundler
+#Cache gems so they don't install on every code change
+WORKDIR /tmp
+COPY Gemfile Gemfile
+COPY Gemfile.lock Gemfile.lock
+RUN bundle install --without test
+
+# Copy site into place.
+RUN mkdir /rails
+WORKDIR /rails
+ADD . /rails
+
+#Need temp secret keys to precompile assets
+ENV WRESTLINGDEV_SECRET_KEY_BASE 077cdbef5c2ccf22543fb17a67339f234306b7fa2e1e4463d851c444c10a5611829a2290b253da78339427f131571fac9a42c83d960b2d25ecc10a4a0a7ce1a2
+ENV WRESTLINGDEV_DEVISE_SECRET_KEY 2f29d49db6704377ba263f7cb9db085b386bcb301c0cd501126a674686ab1a109754071165b08cd72af03cec4642a4dd04361c994462254dd5d85e9594e8b9aa
+RUN RAILS_ENV=production bundle exec rake assets:precompile
+
+# By default, simply start puma.
+WORKDIR /rails
+CMD bundle exec puma -t 5:5 -b 'ssl://0.0.0.0:443?key=/ssl/server.key&verify_mode=none&cert=/ssl/server.crt'  -e production

deploy/rails-prod-create-image.sh

@@ -0,0 +1,14 @@
+#!/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-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
+