From 6aeb64538f593279db41177b522e005180d7a761 Mon Sep 17 00:00:00 2001 From: Jacob Cody Wimer Date: Thu, 3 May 2018 18:45:25 +0000 Subject: [PATCH] Updated to Ruby 2.5.1 and Rails 5.2.0 --- .travis.yml | 2 +- Gemfile | 4 +- Gemfile.lock | 88 +++++++++++++++++-------------- bin/run-tests-with-docker.sh | 2 +- deploy/.rails-dev-Dockerfile.swp | Bin 12288 -> 0 bytes deploy/rails-dev-Dockerfile | 2 +- deploy/rails-prod-Dockerfile | 5 +- 7 files changed, 56 insertions(+), 47 deletions(-) delete mode 100644 deploy/.rails-dev-Dockerfile.swp diff --git a/.travis.yml b/.travis.yml index 6fce4c9..a3e426c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: ruby services: - docker rvm: -- 2.4.2 +- 2.5.1 env: - DB=sqlite script: diff --git a/Gemfile b/Gemfile index 2457e8d..0a4dc97 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source 'https://rubygems.org' -ruby '2.4.2' +ruby '2.5.1' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '5.1.4' +gem 'rails', '5.2.0' # Use sqlite3 as the database for Active Record gem 'sqlite3', :group => :development diff --git a/Gemfile.lock b/Gemfile.lock index 48db22c..54beb54 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,44 +1,48 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.1.4) - actionpack (= 5.1.4) + actioncable (5.2.0) + actionpack (= 5.2.0) nio4r (~> 2.0) - websocket-driver (~> 0.6.1) - actionmailer (5.1.4) - actionpack (= 5.1.4) - actionview (= 5.1.4) - activejob (= 5.1.4) + websocket-driver (>= 0.6.1) + actionmailer (5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.4) - actionview (= 5.1.4) - activesupport (= 5.1.4) + actionpack (5.2.0) + actionview (= 5.2.0) + activesupport (= 5.2.0) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.4) - activesupport (= 5.1.4) + actionview (5.2.0) + activesupport (= 5.2.0) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.4) - activesupport (= 5.1.4) + activejob (5.2.0) + activesupport (= 5.2.0) globalid (>= 0.3.6) - activemodel (5.1.4) - activesupport (= 5.1.4) - activerecord (5.1.4) - activemodel (= 5.1.4) - activesupport (= 5.1.4) - arel (~> 8.0) - activesupport (5.1.4) + activemodel (5.2.0) + activesupport (= 5.2.0) + activerecord (5.2.0) + activemodel (= 5.2.0) + activesupport (= 5.2.0) + arel (>= 9.0) + activestorage (5.2.0) + actionpack (= 5.2.0) + activerecord (= 5.2.0) + marcel (~> 0.3.1) + activesupport (5.2.0) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - arel (8.0.0) + arel (9.0.0) ast (2.4.0) bcrypt (3.1.11) brakeman (4.2.1) @@ -72,7 +76,7 @@ GEM execjs (2.7.0) globalid (0.4.1) activesupport (>= 4.2.0) - i18n (0.9.5) + i18n (1.0.1) concurrent-ruby (~> 1.0) jbuilder (2.7.0) activesupport (>= 4.2.0) @@ -87,7 +91,10 @@ GEM nokogiri (>= 1.5.9) mail (2.7.0) mini_mime (>= 0.1.1) + marcel (0.3.2) + mimemagic (~> 0.3.2) method_source (0.9.0) + mimemagic (0.3.2) mini_mime (1.0.0) mini_portile2 (2.3.0) minitest (5.11.3) @@ -106,17 +113,18 @@ GEM rack (2.0.5) rack-test (1.0.0) rack (>= 1.0, < 3) - rails (5.1.4) - actioncable (= 5.1.4) - actionmailer (= 5.1.4) - actionpack (= 5.1.4) - actionview (= 5.1.4) - activejob (= 5.1.4) - activemodel (= 5.1.4) - activerecord (= 5.1.4) - activesupport (= 5.1.4) + rails (5.2.0) + actioncable (= 5.2.0) + actionmailer (= 5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) + activemodel (= 5.2.0) + activerecord (= 5.2.0) + activestorage (= 5.2.0) + activesupport (= 5.2.0) bundler (>= 1.3.0) - railties (= 5.1.4) + railties (= 5.2.0) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -128,9 +136,9 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (5.1.4) - actionpack (= 5.1.4) - activesupport (= 5.1.4) + railties (5.2.0) + actionpack (= 5.2.0) + activesupport (= 5.2.0) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -179,7 +187,7 @@ GEM uniform_notifier (1.11.0) warden (1.2.7) rack (>= 1.0) - websocket-driver (0.6.5) + websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) @@ -199,7 +207,7 @@ DEPENDENCIES mysql2 newrelic_rpm puma - rails (= 5.1.4) + rails (= 5.2.0) rails_12factor rb-readline round_robin_tournament @@ -212,7 +220,7 @@ DEPENDENCIES uglifier RUBY VERSION - ruby 2.4.2p198 + ruby 2.5.1p57 BUNDLED WITH 1.16.1 diff --git a/bin/run-tests-with-docker.sh b/bin/run-tests-with-docker.sh index 5a5dd94..abac17f 100644 --- a/bin/run-tests-with-docker.sh +++ b/bin/run-tests-with-docker.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -e project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))" docker build -f ${project_dir}/deploy/rails-prod-Dockerfile -t wrestlingdevtests ${project_dir}/. diff --git a/deploy/.rails-dev-Dockerfile.swp b/deploy/.rails-dev-Dockerfile.swp deleted file mode 100644 index 95e684a66b8f6a2675103a245ac48d37805a0c5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2y>1jS5P%&-NeF@$a4u2=k@kG~K|~ah0vAvOmxGHg{0qFhzB?1Iy|KNCLP6+w z0iJ*dfQEvGJOK3RprZl_L`%c?Zu6rkQfgoFvwOR7DLr7xM%`ko32zjYkKQ4_t4~fi*+&H#jh4V`4F5I{u%;z~vMXn5_aj9Gc zt5Mw~tHO4q632GH1T=sKjxi*5;5YR84txW?0H1+Rz(-&k_yC0cya8~a0W^RH&;S}h184vZpaC?12L4k6R~vQ8 zVyRioT@T*C?%rxHFVN{)4L<5zY2Iu%7U+Y@;M?iSBSPluby}r^n21U z71@Cz+C(-r36u-JWZA_MLdVCc(lm0E70xo(<5sX|MhmGshRtWf%7n8evGMqxv8$8` zpD<+-uDr}d|8AQdnxzl>8xTp)(8}Qo6*@Oa5BG;YkUd71g{ONHaCDgp>U)AFMtd%` z2pfgL*17GUaAFXK!%jefy)`9c#&geALc?fnjV4NPT~^R0 z6;E9mxHTocm@cEZkSdLYb3%K`)lrr99@r+Vh6j1DO_8VEhoh2ft!9JTBHp|_Rh_9$ Fkw2`=^_Tzv diff --git a/deploy/rails-dev-Dockerfile b/deploy/rails-dev-Dockerfile index 8aa6a7e..1202443 100644 --- a/deploy/rails-dev-Dockerfile +++ b/deploy/rails-dev-Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.4.2 +FROM ruby:2.5.1 RUN apt-get -qq update \ && apt-get -qq install -y \ diff --git a/deploy/rails-prod-Dockerfile b/deploy/rails-prod-Dockerfile index b1b53a4..d04dab6 100644 --- a/deploy/rails-prod-Dockerfile +++ b/deploy/rails-prod-Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.4.2 +FROM ruby:2.5.1 RUN apt-get -qq update \ && DEBIAN_FRONTEND=noninteractive apt-get -qq upgrade -y \ @@ -53,7 +53,8 @@ RUN gem install --no-rdoc --no-ri bundler WORKDIR /tmp COPY Gemfile Gemfile COPY Gemfile.lock Gemfile.lock -RUN bundle install --without test +#RUN bundle install --without test +RUN bundle install # Copy site into place. RUN mkdir /rails