cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-04-19 14:00:27 +00:00
Code Issues Releases Wiki Activity

Upgraded to rails 6.1.5.1 and Ruby 3.0.4

Browse Source
This commit is contained in:
Jacob Cody Wimer
2022-04-28 00:53:18 +00:00
parent 4d3f93a109
commit 85701e194a
4 changed files with 78 additions and 74 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 '3.0.0' ruby '3.0.4'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '6.1.5' gem 'rails', '6.1.5.1'
# 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

144
Gemfile.lock
View File

@@ -1,60 +1,60 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (6.1.5) actioncable (6.1.5.1)
actionpack (= 6.1.5) actionpack (= 6.1.5.1)
activesupport (= 6.1.5) activesupport (= 6.1.5.1)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailbox (6.1.5) actionmailbox (6.1.5.1)
actionpack (= 6.1.5) actionpack (= 6.1.5.1)
activejob (= 6.1.5) activejob (= 6.1.5.1)
activerecord (= 6.1.5) activerecord (= 6.1.5.1)
activestorage (= 6.1.5) activestorage (= 6.1.5.1)
activesupport (= 6.1.5) activesupport (= 6.1.5.1)
mail (>= 2.7.1) mail (>= 2.7.1)
actionmailer (6.1.5) actionmailer (6.1.5.1)
actionpack (= 6.1.5) actionpack (= 6.1.5.1)
actionview (= 6.1.5) actionview (= 6.1.5.1)
activejob (= 6.1.5) activejob (= 6.1.5.1)
activesupport (= 6.1.5) activesupport (= 6.1.5.1)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (6.1.5) actionpack (6.1.5.1)
actionview (= 6.1.5) actionview (= 6.1.5.1)
activesupport (= 6.1.5) activesupport (= 6.1.5.1)
rack (~> 2.0, >= 2.0.9) rack (~> 2.0, >= 2.0.9)
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.1.5) actiontext (6.1.5.1)
actionpack (= 6.1.5) actionpack (= 6.1.5.1)
activerecord (= 6.1.5) activerecord (= 6.1.5.1)
activestorage (= 6.1.5) activestorage (= 6.1.5.1)
activesupport (= 6.1.5) activesupport (= 6.1.5.1)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (6.1.5) actionview (6.1.5.1)
activesupport (= 6.1.5) activesupport (= 6.1.5.1)
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.1.5) activejob (6.1.5.1)
activesupport (= 6.1.5) activesupport (= 6.1.5.1)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (6.1.5) activemodel (6.1.5.1)
activesupport (= 6.1.5) activesupport (= 6.1.5.1)
activerecord (6.1.5) activerecord (6.1.5.1)
activemodel (= 6.1.5) activemodel (= 6.1.5.1)
activesupport (= 6.1.5) activesupport (= 6.1.5.1)
activestorage (6.1.5) activestorage (6.1.5.1)
actionpack (= 6.1.5) actionpack (= 6.1.5.1)
activejob (= 6.1.5) activejob (= 6.1.5.1)
activerecord (= 6.1.5) activerecord (= 6.1.5.1)
activesupport (= 6.1.5) activesupport (= 6.1.5.1)
marcel (~> 1.0) marcel (~> 1.0)
mini_mime (>= 1.1.0) mini_mime (>= 1.1.0)
activesupport (6.1.5) activesupport (6.1.5.1)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
minitest (>= 5.1) minitest (>= 5.1)
@@ -62,7 +62,7 @@ GEM
zeitwerk (~> 2.3) zeitwerk (~> 2.3)
ast (2.4.2) ast (2.4.2)
bcrypt (3.1.17) bcrypt (3.1.17)
brakeman (5.2.1) brakeman (5.2.2)
builder (3.2.4) builder (3.2.4)
bullet (7.0.1) bullet (7.0.1)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
@@ -116,7 +116,7 @@ GEM
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
libv8 (3.16.14.19-x86_64-linux) libv8 (3.16.14.19-x86_64-linux)
loofah (2.15.0) loofah (2.16.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.7.1) mail (2.7.1)
@@ -128,18 +128,20 @@ GEM
mustermann (1.1.1) mustermann (1.1.1)
ruby2_keywords (~> 0.0.1) ruby2_keywords (~> 0.0.1)
mysql2 (0.5.3) mysql2 (0.5.3)
newrelic_rpm (8.5.0) newrelic_rpm (8.6.0)
nio4r (2.5.8) nio4r (2.5.8)
nokogiri (1.13.3-x86_64-linux) nokogiri (1.13.4-x86_64-linux)
racc (~> 1.4) racc (~> 1.4)
orm_adapter (0.5.0) orm_adapter (0.5.0)
parallel (1.22.0) parallel (1.22.1)
parser (3.1.1.0) parser (3.1.2.0)
ast (~> 2.4.1) ast (~> 2.4.1)
passenger (6.0.12) passenger (6.0.13)
rack rack
rake (>= 0.8.1) rake (>= 0.8.1)
puma (5.6.2) psych (4.0.3)
stringio
puma (5.6.4)
nio4r (~> 2.0) nio4r (~> 2.0)
racc (1.6.0) racc (1.6.0)
rack (2.2.3) rack (2.2.3)
@@ -147,20 +149,20 @@ GEM
rack rack
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails (6.1.5) rails (6.1.5.1)
actioncable (= 6.1.5) actioncable (= 6.1.5.1)
actionmailbox (= 6.1.5) actionmailbox (= 6.1.5.1)
actionmailer (= 6.1.5) actionmailer (= 6.1.5.1)
actionpack (= 6.1.5) actionpack (= 6.1.5.1)
actiontext (= 6.1.5) actiontext (= 6.1.5.1)
actionview (= 6.1.5) actionview (= 6.1.5.1)
activejob (= 6.1.5) activejob (= 6.1.5.1)
activemodel (= 6.1.5) activemodel (= 6.1.5.1)
activerecord (= 6.1.5) activerecord (= 6.1.5.1)
activestorage (= 6.1.5) activestorage (= 6.1.5.1)
activesupport (= 6.1.5) activesupport (= 6.1.5.1)
bundler (>= 1.15.0) bundler (>= 1.15.0)
railties (= 6.1.5) railties (= 6.1.5.1)
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)
@@ -172,38 +174,39 @@ 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.1.5) railties (6.1.5.1)
actionpack (= 6.1.5) actionpack (= 6.1.5.1)
activesupport (= 6.1.5) activesupport (= 6.1.5.1)
method_source method_source
rake (>= 12.2) rake (>= 12.2)
thor (~> 1.0) thor (~> 1.0)
rainbow (3.1.1) rainbow (3.1.1)
rake (13.0.6) rake (13.0.6)
rb-readline (0.5.5) rb-readline (0.5.5)
rdoc (6.3.3) rdoc (6.4.0)
psych (>= 4.0.0)
ref (2.0.0) ref (2.0.0)
regexp_parser (2.2.1) regexp_parser (2.3.1)
responders (3.0.1) responders (3.0.1)
actionpack (>= 5.0) actionpack (>= 5.0)
railties (>= 5.0) railties (>= 5.0)
rexml (3.2.5) rexml (3.2.5)
round_robin_tournament (0.1.1) round_robin_tournament (0.1.1)
rubocop (1.26.1) rubocop (1.28.2)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 3.1.0.0) parser (>= 3.1.0.0)
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0) regexp_parser (>= 1.8, < 3.0)
rexml rexml
rubocop-ast (>= 1.16.0, < 2.0) rubocop-ast (>= 1.17.0, < 2.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0) unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.16.0) rubocop-ast (1.17.0)
parser (>= 3.1.1.0) parser (>= 3.1.1.0)
ruby-progressbar (1.11.0) ruby-progressbar (1.11.0)
ruby2_keywords (0.0.5) ruby2_keywords (0.0.5)
sdoc (2.3.1) sdoc (2.3.2)
rdoc (>= 5.0, < 6.4.0) rdoc (>= 5.0)
sinatra (2.2.0) sinatra (2.2.0)
mustermann (~> 1.0) mustermann (~> 1.0)
rack (~> 2.2) rack (~> 2.2)
@@ -218,6 +221,7 @@ GEM
activesupport (>= 5.2) activesupport (>= 5.2)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sqlite3 (1.4.2) sqlite3 (1.4.2)
stringio (3.0.1)
therubyracer (0.12.3) therubyracer (0.12.3)
libv8 (~> 3.16.14.15) libv8 (~> 3.16.14.15)
ref ref
@@ -233,7 +237,7 @@ GEM
uglifier (4.2.0) uglifier (4.2.0)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
unicode-display_width (2.1.0) unicode-display_width (2.1.0)
uniform_notifier (1.15.0) uniform_notifier (1.16.0)
warden (1.2.9) warden (1.2.9)
rack (>= 2.0.9) rack (>= 2.0.9)
websocket-driver (0.7.5) websocket-driver (0.7.5)
@@ -262,7 +266,7 @@ DEPENDENCIES
newrelic_rpm newrelic_rpm
passenger passenger
puma puma
rails (= 6.1.5) rails (= 6.1.5.1)
rails_12factor rails_12factor
rb-readline rb-readline
round_robin_tournament round_robin_tournament

2
deploy/rails-dev-Dockerfile
View File

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

2
deploy/rails-prod-Dockerfile
View File

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