cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-03-25 01:14:43 +00:00
Code Issues Releases Wiki Activity

Updated to ruby 2.7.2 and rails 6.0.3.3

Browse Source
This commit is contained in:
Jacob Cody Wimer
2020-11-10 15:45:30 -05:00
parent 4522113396
commit 1f5aa304ff
4 changed files with 80 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@@ -1,8 +1,8 @@
source 'https://rubygems.org' source 'https://rubygems.org'
ruby '2.6.5' ruby '2.7.2'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '6.0.3.2' gem 'rails', '6.0.3.3'
# Use sqlite3 as the database for Active Record # Use sqlite3 as the database for Active Record
#gem 'sqlite3', '~> 1.3', '< 1.4', :group => :development #gem 'sqlite3', '~> 1.3', '< 1.4', :group => :development
gem 'sqlite3', :group => :development gem 'sqlite3', :group => :development

148
Gemfile.lock
View File

@@ -1,56 +1,56 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (6.0.3.2) actioncable (6.0.3.3)
actionpack (= 6.0.3.2) actionpack (= 6.0.3.3)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailbox (6.0.3.2) actionmailbox (6.0.3.3)
actionpack (= 6.0.3.2) actionpack (= 6.0.3.3)
activejob (= 6.0.3.2) activejob (= 6.0.3.3)
activerecord (= 6.0.3.2) activerecord (= 6.0.3.3)
activestorage (= 6.0.3.2) activestorage (= 6.0.3.3)
activesupport (= 6.0.3.2) activesupport (= 6.0.3.3)
mail (>= 2.7.1) mail (>= 2.7.1)
actionmailer (6.0.3.2) actionmailer (6.0.3.3)
actionpack (= 6.0.3.2) actionpack (= 6.0.3.3)
actionview (= 6.0.3.2) actionview (= 6.0.3.3)
activejob (= 6.0.3.2) activejob (= 6.0.3.3)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (6.0.3.2) actionpack (6.0.3.3)
actionview (= 6.0.3.2) actionview (= 6.0.3.3)
activesupport (= 6.0.3.2) activesupport (= 6.0.3.3)
rack (~> 2.0, >= 2.0.8) rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.3.2) actiontext (6.0.3.3)
actionpack (= 6.0.3.2) actionpack (= 6.0.3.3)
activerecord (= 6.0.3.2) activerecord (= 6.0.3.3)
activestorage (= 6.0.3.2) activestorage (= 6.0.3.3)
activesupport (= 6.0.3.2) activesupport (= 6.0.3.3)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (6.0.3.2) actionview (6.0.3.3)
activesupport (= 6.0.3.2) activesupport (= 6.0.3.3)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.3.2) activejob (6.0.3.3)
activesupport (= 6.0.3.2) activesupport (= 6.0.3.3)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (6.0.3.2) activemodel (6.0.3.3)
activesupport (= 6.0.3.2) activesupport (= 6.0.3.3)
activerecord (6.0.3.2) activerecord (6.0.3.3)
activemodel (= 6.0.3.2) activemodel (= 6.0.3.3)
activesupport (= 6.0.3.2) activesupport (= 6.0.3.3)
activestorage (6.0.3.2) activestorage (6.0.3.3)
actionpack (= 6.0.3.2) actionpack (= 6.0.3.3)
activejob (= 6.0.3.2) activejob (= 6.0.3.3)
activerecord (= 6.0.3.2) activerecord (= 6.0.3.3)
marcel (~> 0.3.1) marcel (~> 0.3.1)
activesupport (6.0.3.2) activesupport (6.0.3.3)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
@@ -60,7 +60,7 @@ GEM
ast (2.4.1) ast (2.4.1)
backports (3.18.2) backports (3.18.2)
bcrypt (3.1.16) bcrypt (3.1.16)
brakeman (4.9.1) brakeman (4.10.0)
builder (3.2.4) builder (3.2.4)
bullet (6.1.0) bullet (6.1.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
@@ -78,7 +78,7 @@ GEM
concurrent-ruby (1.1.7) concurrent-ruby (1.1.7)
crass (1.0.6) crass (1.0.6)
daemons (1.3.1) daemons (1.3.1)
dalli (2.7.10) dalli (2.7.11)
delayed_job (4.1.8) delayed_job (4.1.8)
activesupport (>= 3.0, < 6.1) activesupport (>= 3.0, < 6.1)
delayed_job_active_record (4.1.4) delayed_job_active_record (4.1.4)
@@ -89,7 +89,7 @@ GEM
delayed_job (> 2.0.3) delayed_job (> 2.0.3)
rack-protection (>= 1.5.5) rack-protection (>= 1.5.5)
sinatra (>= 1.4.4) sinatra (>= 1.4.4)
devise (4.7.2) devise (4.7.3)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 4.1.0) railties (>= 4.1.0)
@@ -150,7 +150,7 @@ GEM
method_source (1.0.0) method_source (1.0.0)
mime-types (3.3.1) mime-types (3.3.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2020.0512) mime-types-data (3.2020.1104)
mimemagic (0.3.5) mimemagic (0.3.5)
mini_mime (1.0.2) mini_mime (1.0.2)
mini_portile2 (2.4.0) mini_portile2 (2.4.0)
@@ -163,18 +163,18 @@ GEM
net-http-persistent (2.9.4) net-http-persistent (2.9.4)
net-http-pipeline (1.0.1) net-http-pipeline (1.0.1)
netrc (0.11.0) netrc (0.11.0)
newrelic_rpm (6.12.0.367) newrelic_rpm (6.13.1)
nio4r (2.5.3) nio4r (2.5.4)
nokogiri (1.10.10) nokogiri (1.10.10)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0) orm_adapter (0.5.0)
parallel (1.19.2) parallel (1.20.0)
parser (2.7.1.4) parser (2.7.2.0)
ast (~> 2.4.1) ast (~> 2.4.1)
passenger (6.0.6) passenger (6.0.6)
rack rack
rake (>= 0.8.1) rake (>= 0.8.1)
puma (4.3.6) puma (5.0.4)
nio4r (~> 2.0) nio4r (~> 2.0)
pusher-client (0.6.2) pusher-client (0.6.2)
json json
@@ -184,20 +184,20 @@ GEM
rack rack
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails (6.0.3.2) rails (6.0.3.3)
actioncable (= 6.0.3.2) actioncable (= 6.0.3.3)
actionmailbox (= 6.0.3.2) actionmailbox (= 6.0.3.3)
actionmailer (= 6.0.3.2) actionmailer (= 6.0.3.3)
actionpack (= 6.0.3.2) actionpack (= 6.0.3.3)
actiontext (= 6.0.3.2) actiontext (= 6.0.3.3)
actionview (= 6.0.3.2) actionview (= 6.0.3.3)
activejob (= 6.0.3.2) activejob (= 6.0.3.3)
activemodel (= 6.0.3.2) activemodel (= 6.0.3.3)
activerecord (= 6.0.3.2) activerecord (= 6.0.3.3)
activestorage (= 6.0.3.2) activestorage (= 6.0.3.3)
activesupport (= 6.0.3.2) activesupport (= 6.0.3.3)
bundler (>= 1.3.0) bundler (>= 1.3.0)
railties (= 6.0.3.2) railties (= 6.0.3.3)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
@@ -209,9 +209,9 @@ GEM
rails_stdout_logging rails_stdout_logging
rails_serve_static_assets (0.0.5) rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5) rails_stdout_logging (0.0.5)
railties (6.0.3.2) railties (6.0.3.3)
actionpack (= 6.0.3.2) actionpack (= 6.0.3.3)
activesupport (= 6.0.3.2) activesupport (= 6.0.3.3)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0) thor (>= 0.20.3, < 2.0)
@@ -220,7 +220,7 @@ GEM
rb-readline (0.5.5) rb-readline (0.5.5)
rdoc (6.2.1) rdoc (6.2.1)
ref (2.0.0) ref (2.0.0)
regexp_parser (1.7.1) regexp_parser (1.8.2)
responders (3.0.1) responders (3.0.1)
actionpack (>= 5.0) actionpack (>= 5.0)
railties (>= 5.0) railties (>= 5.0)
@@ -231,20 +231,20 @@ GEM
netrc (~> 0.8) netrc (~> 0.8)
rexml (3.2.4) rexml (3.2.4)
round_robin_tournament (0.0.1) round_robin_tournament (0.0.1)
rubocop (0.91.0) rubocop (1.2.0)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 2.7.1.1) parser (>= 2.7.1.5)
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7) regexp_parser (>= 1.8)
rexml rexml
rubocop-ast (>= 0.4.0, < 1.0) rubocop-ast (>= 1.0.1)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0) unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.4.0) rubocop-ast (1.1.1)
parser (>= 2.7.1.4) parser (>= 2.7.1.5)
ruby-progressbar (1.10.1) ruby-progressbar (1.10.1)
ruby2_keywords (0.0.2) ruby2_keywords (0.0.2)
sdoc (1.1.0) sdoc (2.0.2)
rdoc (>= 5.0) rdoc (>= 5.0)
sinatra (2.1.0) sinatra (2.1.0)
mustermann (~> 1.0) mustermann (~> 1.0)
@@ -260,7 +260,7 @@ GEM
activesupport (>= 4.0) activesupport (>= 4.0)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sqlite3 (1.4.2) sqlite3 (1.4.2)
terminal-table (1.8.0) terminal-table (2.0.0)
unicode-display_width (~> 1.1, >= 1.1.1) unicode-display_width (~> 1.1, >= 1.1.1)
therubyracer (0.12.3) therubyracer (0.12.3)
libv8 (~> 3.16.14.15) libv8 (~> 3.16.14.15)
@@ -282,9 +282,9 @@ GEM
turbolinks-source (5.2.0) turbolinks-source (5.2.0)
typhoeus (0.8.0) typhoeus (0.8.0)
ethon (>= 0.8.0) ethon (>= 0.8.0)
tzinfo (1.2.7) tzinfo (1.2.8)
thread_safe (~> 0.1) thread_safe (~> 0.1)
tzinfo-data (1.2020.1) tzinfo-data (1.2020.4)
tzinfo (>= 1.0.0) tzinfo (>= 1.0.0)
uglifier (4.2.0) uglifier (4.2.0)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
@@ -299,7 +299,7 @@ GEM
websocket-driver (0.7.3) websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5) websocket-extensions (0.1.5)
zeitwerk (2.4.0) zeitwerk (2.4.1)
PLATFORMS PLATFORMS
ruby ruby
@@ -321,7 +321,7 @@ DEPENDENCIES
newrelic_rpm newrelic_rpm
passenger passenger
puma puma
rails (= 6.0.3.2) rails (= 6.0.3.3)
rails_12factor rails_12factor
rb-readline rb-readline
round_robin_tournament round_robin_tournament
@@ -336,7 +336,7 @@ DEPENDENCIES
uglifier uglifier
RUBY VERSION RUBY VERSION
ruby 2.6.5p114 ruby 2.7.2p137
BUNDLED WITH BUNDLED WITH
2.0.2 2.1.4

5
deploy/rails-dev-Dockerfile
View File

@@ -1,4 +1,4 @@
FROM ruby:2.6.5 FROM ruby:2.7.2
RUN apt-get -qq update \ RUN apt-get -qq update \
&& apt-get -qq install -y \ && apt-get -qq install -y \
@@ -22,7 +22,8 @@ RUN gem install bundler
RUN gem update --system RUN gem update --system
ADD Gemfile* /tmp/ ADD Gemfile* /tmp/
WORKDIR /tmp WORKDIR /tmp
RUN bundle install --jobs 4 --without production RUN bundle config set without 'production'
RUN bundle install --jobs 4
RUN mkdir /rails RUN mkdir /rails
WORKDIR /rails WORKDIR /rails

2
deploy/rails-prod-Dockerfile
View File

@@ -1,4 +1,4 @@
FROM ruby:2.6.5-slim FROM ruby:2.7.2-slim
#HEALTHCHECK --start-period=60s CMD curl http://127.0.0.1/ #HEALTHCHECK --start-period=60s CMD curl http://127.0.0.1/