Merge branch 'development'

.travis.yml

@@ -3,7 +3,7 @@ language: ruby
 services:
 - docker
 rvm:
-- 2.5.1
+- 2.4.4
 env:
 - DB=sqlite
 script:

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '2.5.1'
+ruby '2.4.4'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '5.2.0'
 # Use sqlite3 as the database for Active Record
@@ -52,7 +52,7 @@ gem 'cancancan'
 gem 'round_robin_tournament'
 gem 'rb-readline'
 gem 'delayed_job_active_record'
-#gem 'puma'
+gem 'puma'
 gem 'passenger'
 gem 'travis'
 

Gemfile.lock

@@ -149,17 +149,18 @@ GEM
       mini_portile2 (~> 2.3.0)
     orm_adapter (0.5.0)
     parallel (1.12.1)
-    parser (2.5.1.0)
+    parser (2.5.1.2)
       ast (~> 2.4.0)
     passenger (5.3.3)
       rack
       rake (>= 0.8.1)
     powerpack (0.1.2)
+    puma (3.12.0)
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
     rack (2.0.5)
-    rack-test (1.0.0)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.0)
       actioncable (= 5.2.0)
@@ -203,10 +204,10 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     round_robin_tournament (0.0.1)
-    rubocop (0.58.0)
+    rubocop (0.58.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
+      parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
@@ -247,7 +248,7 @@ GEM
       ethon (>= 0.8.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.14)
+    uglifier (4.1.15)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
@@ -278,6 +279,7 @@ DEPENDENCIES
   mysql2
   newrelic_rpm
   passenger
+  puma
   rails (= 5.2.0)
   rails_12factor
   rb-readline
@@ -292,7 +294,7 @@ DEPENDENCIES
   uglifier
 
 RUBY VERSION
-   ruby 2.5.1p57
+   ruby 2.4.4p296
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

Procfile

@@ -1,3 +1,3 @@
 worker: bundle exec rake jobs:work
-#web: bundle exec puma -t 5:5 -p ${PORT:-3000} -e ${RACK_ENV:-development}
-web: bundle exec passenger start -p $PORT --max-pool-size 3
+web: bundle exec puma -t 5:5 -p ${PORT:-3000} -e ${RACK_ENV:-development}
+#web: bundle exec passenger start -p $PORT --max-pool-size 3

db/seeds.rb

@@ -5,7 +5,7 @@
 #
 #   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
 #   Mayor.create(name: 'Emanuel', city: cities.first)
-if Rails.env.development?
+#if Rails.env.development?
 	User.create(id: 1, email: 'test@test.com', password: 'password', password_confirmation: 'password')
 	Tournament.create(id: 200, name: 'test', address: 'some place', director: 'some guy', director_email: 'hismail@email.com', tournament_type: 'Pool to bracket', user_id: 1, date: Date.today)
 	School.create(id: 200, name: 'Central Crossing', tournament_id: 200)
@@ -75,7 +75,7 @@ if Rails.env.development?
 	Wrestler.create(name: 'Guy 50', school_id: 204, weight_id: 204, original_seed: nil, season_win: 0, season_loss: 0, criteria: 'N/A')
 	Wrestler.create(name: 'Guy 51', school_id: 204, weight_id: 204, original_seed: nil, season_win: 0, season_loss: 0, criteria: 'N/A')
 	Wrestler.create(name: 'Guy 52', school_id: 204, weight_id: 204, original_seed: nil, season_win: 0, season_loss: 0, criteria: 'N/A')
-end
+#end
 
 
 

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

@@ -22,7 +22,7 @@ services:
       test: curl --insecure https://127.0.0.1/
 
   db:
-    image: mysql:5.5
+    image: mysql:5.7
     ports:
       - "3306:3306"
     volumes:
@@ -42,12 +42,12 @@ services:
     env_file:
       - ./prod.env
     healthcheck:
-        test: ps -ef | grep rake | grep ruby
+        test: kill -0 1
     command: bundle exec rake jobs:work RAILS_ENV=production
 
 
   memcached:
-    image: memcached
+    image: memcached:1.5
     mem_limit: 64000000
     restart: always
     networks:

deploy/docker-compose-test.yml

@@ -42,7 +42,7 @@ services:
       test: curl --insecure https://127.0.0.1/
 
   db:
-    image: mysql:5.5
+    image: mysql:5.7
     ports:
       - "3306:3306"
     volumes:
@@ -82,7 +82,7 @@ services:
       caching:
     restart: always
     healthcheck:
-        test: ps -ef | grep rake | grep ruby
+        test: kill -0 1
     command: bundle exec rake jobs:work RAILS_ENV=production
     deploy:
       resources:
@@ -94,7 +94,7 @@ services:
           memory: 256M
 
   memcached:
-    image: memcached
+    image: memcached:1.5
     deploy:
       resources:
         limits:

deploy/rails-dev-Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.5.1
+FROM ruby:2.4.4
 
 RUN apt-get -qq update \
   && apt-get -qq install -y \

deploy/rails-prod-Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.5.1
+FROM ruby:2.4.4
 
 HEALTHCHECK --start-period=30s CMD curl --insecure https://127.0.0.1/
 
@@ -70,5 +70,5 @@ RUN RAILS_ENV=production bundle exec rake assets:precompile
 
 # By default, simply start puma.
 WORKDIR /rails
-#CMD bundle exec puma -t 3:3 -b 'ssl://0.0.0.0:443?key=/ssl/server.key&verify_mode=none&cert=/ssl/server.crt'  -e production
-CMD bundle exec passenger start -p 443 --max-pool-size 3 --environment production --ssl --ssl-certificate /ssl/server.crt --ssl-certificate-key /ssl/server.key
+CMD bundle exec puma -t 3:3 -b 'ssl://0.0.0.0:443?key=/ssl/server.key&verify_mode=none&cert=/ssl/server.crt'  -e production
+#CMD bundle exec passenger start -p 443 --max-pool-size 3 --environment production --ssl --ssl-certificate /ssl/server.crt --ssl-certificate-key /ssl/server.key