From 31fbe5baffd9491b0f960ccd72608958390454fc Mon Sep 17 00:00:00 2001 From: Jacob Cody Wimer Date: Fri, 19 Apr 2019 10:29:06 -0400 Subject: [PATCH] Updated to ruby 2.6.0 and updated gems --- Gemfile | 2 +- Gemfile.lock | 66 ++++++++++++++++++------------------ deploy/rails-dev-Dockerfile | 2 +- deploy/rails-prod-Dockerfile | 2 +- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Gemfile b/Gemfile index 11a656a..3a7646c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -ruby '2.5.1' +ruby '2.6.0' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '5.2.2' # Use sqlite3 as the database for Active Record diff --git a/Gemfile.lock b/Gemfile.lock index 147300a..0042f28 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,14 +45,14 @@ GEM addressable (2.4.0) arel (9.0.0) ast (2.4.0) - backports (3.11.4) + backports (3.13.0) bcrypt (3.1.12) - brakeman (4.3.1) + brakeman (4.5.0) builder (3.2.3) bullet (5.9.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) - cancancan (2.3.0) + cancancan (3.0.1) coffee-rails (4.2.2) coffee-script (>= 2.2.0) railties (>= 4.0.0) @@ -62,10 +62,10 @@ GEM coffee-script-source (1.12.2) commander (4.4.6) highline (~> 1.7.2) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) crass (1.0.4) daemons (1.3.1) - dalli (2.7.9) + dalli (2.7.10) delayed_job (4.1.5) activesupport (>= 3.0, < 5.3) delayed_job_active_record (4.1.3) @@ -76,7 +76,7 @@ GEM delayed_job (> 2.0.3) rack-protection (>= 1.5.5) sinatra (>= 1.4.4) - devise (4.5.0) + devise (4.6.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 6.0) @@ -85,14 +85,14 @@ GEM domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) erubi (1.8.0) - ethon (0.11.0) + ethon (0.12.0) ffi (>= 1.3.0) execjs (2.7.0) faraday (0.15.4) multipart-post (>= 1.2, < 3) - faraday_middleware (0.12.2) + faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) - ffi (1.9.25) + ffi (1.10.0) gh (0.15.1) addressable (~> 2.4.0) backports @@ -100,7 +100,7 @@ GEM multi_json (~> 1.0) net-http-persistent (~> 2.9) net-http-pipeline - globalid (0.4.1) + globalid (0.4.2) activesupport (>= 4.2.0) hakiri (0.7.2) activesupport @@ -114,9 +114,9 @@ GEM highline (1.7.10) http-cookie (1.0.3) domain_name (~> 0.5) - i18n (1.3.0) + i18n (1.6.0) concurrent-ruby (~> 1.0) - jaro_winkler (1.5.1) + jaro_winkler (1.5.2) jbuilder (2.8.0) activesupport (>= 4.2.0) multi_json (>= 1.2) @@ -124,7 +124,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.1.0) + json (2.2.0) launchy (2.4.3) addressable (~> 2.3) libv8 (3.16.14.19) @@ -138,7 +138,7 @@ GEM method_source (0.9.2) mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) + mime-types-data (3.2019.0331) mimemagic (0.3.3) mini_mime (1.0.1) mini_portile2 (2.4.0) @@ -150,23 +150,23 @@ GEM net-http-persistent (2.9.4) net-http-pipeline (1.0.1) netrc (0.11.0) - newrelic_rpm (5.6.0.349) + newrelic_rpm (6.2.0.354) nio4r (2.3.1) - nokogiri (1.9.1) + nokogiri (1.10.2) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) - parallel (1.12.1) - parser (2.5.3.0) + parallel (1.17.0) + parser (2.6.2.1) ast (~> 2.4.0) - passenger (6.0.0) + passenger (6.0.2) rack rake (>= 0.8.1) - powerpack (0.1.2) - puma (3.12.0) + psych (3.1.0) + puma (3.12.1) pusher-client (0.6.2) json websocket (~> 1.0) - rack (2.0.6) + rack (2.0.7) rack-protection (2.0.5) rack rack-test (1.1.0) @@ -203,24 +203,24 @@ GEM rainbow (3.0.0) rake (12.3.2) rb-readline (0.5.5) - rdoc (6.1.0) + rdoc (6.1.1) ref (2.0.0) - responders (2.4.0) - actionpack (>= 4.2.0, < 5.3) - railties (>= 4.2.0, < 5.3) + responders (2.4.1) + actionpack (>= 4.2.0, < 6.0) + railties (>= 4.2.0, < 6.0) rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) round_robin_tournament (0.0.1) - rubocop (0.61.1) + rubocop (0.67.2) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) - powerpack (~> 0.1) + psych (>= 3.1.0) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.4.0) + unicode-display_width (>= 1.4.0, < 1.6) ruby-progressbar (1.10.0) sdoc (1.0.0) rdoc (>= 5.0) @@ -238,7 +238,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.13) + sqlite3 (1.4.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) therubyracer (0.12.3) @@ -263,14 +263,14 @@ GEM ethon (>= 0.8.0) tzinfo (1.2.5) thread_safe (~> 0.1) - tzinfo-data (1.2018.7) + tzinfo-data (1.2019.1) tzinfo (>= 1.0.0) uglifier (4.1.20) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext unf_ext (0.0.7.5) - unicode-display_width (1.4.1) + unicode-display_width (1.5.0) uniform_notifier (1.12.1) warden (1.2.8) rack (>= 2.0.6) @@ -314,7 +314,7 @@ DEPENDENCIES uglifier RUBY VERSION - ruby 2.5.1p57 + ruby 2.6.0p0 BUNDLED WITH 1.17.2 diff --git a/deploy/rails-dev-Dockerfile b/deploy/rails-dev-Dockerfile index 1202443..d447b7b 100644 --- a/deploy/rails-dev-Dockerfile +++ b/deploy/rails-dev-Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.5.1 +FROM ruby:2.6.0 RUN apt-get -qq update \ && apt-get -qq install -y \ diff --git a/deploy/rails-prod-Dockerfile b/deploy/rails-prod-Dockerfile index 29960c0..35feb16 100644 --- a/deploy/rails-prod-Dockerfile +++ b/deploy/rails-prod-Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.5.1-slim +FROM ruby:2.6.0-slim #HEALTHCHECK --start-period=60s CMD curl http://127.0.0.1/