1
0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-03-25 01:14:43 +00:00

Updated to Ruby 2.5.1 and Rails 5.2.0

This commit is contained in:
2018-05-03 18:45:25 +00:00
parent 5c8c275531
commit 6aeb64538f
7 changed files with 56 additions and 47 deletions

View File

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

View File

@@ -1,8 +1,8 @@
source 'https://rubygems.org' source 'https://rubygems.org'
ruby '2.4.2' ruby '2.5.1'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # 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 # Use sqlite3 as the database for Active Record
gem 'sqlite3', :group => :development gem 'sqlite3', :group => :development

View File

@@ -1,44 +1,48 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (5.1.4) actioncable (5.2.0)
actionpack (= 5.1.4) actionpack (= 5.2.0)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (~> 0.6.1) websocket-driver (>= 0.6.1)
actionmailer (5.1.4) actionmailer (5.2.0)
actionpack (= 5.1.4) actionpack (= 5.2.0)
actionview (= 5.1.4) actionview (= 5.2.0)
activejob (= 5.1.4) activejob (= 5.2.0)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (5.1.4) actionpack (5.2.0)
actionview (= 5.1.4) actionview (= 5.2.0)
activesupport (= 5.1.4) activesupport (= 5.2.0)
rack (~> 2.0) rack (~> 2.0)
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.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.4) actionview (5.2.0)
activesupport (= 5.1.4) activesupport (= 5.2.0)
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.0, >= 1.0.3) rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.4) activejob (5.2.0)
activesupport (= 5.1.4) activesupport (= 5.2.0)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (5.1.4) activemodel (5.2.0)
activesupport (= 5.1.4) activesupport (= 5.2.0)
activerecord (5.1.4) activerecord (5.2.0)
activemodel (= 5.1.4) activemodel (= 5.2.0)
activesupport (= 5.1.4) activesupport (= 5.2.0)
arel (~> 8.0) arel (>= 9.0)
activesupport (5.1.4) 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) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
tzinfo (~> 1.1) tzinfo (~> 1.1)
arel (8.0.0) arel (9.0.0)
ast (2.4.0) ast (2.4.0)
bcrypt (3.1.11) bcrypt (3.1.11)
brakeman (4.2.1) brakeman (4.2.1)
@@ -72,7 +76,7 @@ GEM
execjs (2.7.0) execjs (2.7.0)
globalid (0.4.1) globalid (0.4.1)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
i18n (0.9.5) i18n (1.0.1)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jbuilder (2.7.0) jbuilder (2.7.0)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
@@ -87,7 +91,10 @@ GEM
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.7.0) mail (2.7.0)
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
marcel (0.3.2)
mimemagic (~> 0.3.2)
method_source (0.9.0) method_source (0.9.0)
mimemagic (0.3.2)
mini_mime (1.0.0) mini_mime (1.0.0)
mini_portile2 (2.3.0) mini_portile2 (2.3.0)
minitest (5.11.3) minitest (5.11.3)
@@ -106,17 +113,18 @@ GEM
rack (2.0.5) rack (2.0.5)
rack-test (1.0.0) rack-test (1.0.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails (5.1.4) rails (5.2.0)
actioncable (= 5.1.4) actioncable (= 5.2.0)
actionmailer (= 5.1.4) actionmailer (= 5.2.0)
actionpack (= 5.1.4) actionpack (= 5.2.0)
actionview (= 5.1.4) actionview (= 5.2.0)
activejob (= 5.1.4) activejob (= 5.2.0)
activemodel (= 5.1.4) activemodel (= 5.2.0)
activerecord (= 5.1.4) activerecord (= 5.2.0)
activesupport (= 5.1.4) activestorage (= 5.2.0)
activesupport (= 5.2.0)
bundler (>= 1.3.0) bundler (>= 1.3.0)
railties (= 5.1.4) railties (= 5.2.0)
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)
@@ -128,9 +136,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 (5.1.4) railties (5.2.0)
actionpack (= 5.1.4) actionpack (= 5.2.0)
activesupport (= 5.1.4) activesupport (= 5.2.0)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
@@ -179,7 +187,7 @@ GEM
uniform_notifier (1.11.0) uniform_notifier (1.11.0)
warden (1.2.7) warden (1.2.7)
rack (>= 1.0) rack (>= 1.0)
websocket-driver (0.6.5) websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3) websocket-extensions (0.1.3)
@@ -199,7 +207,7 @@ DEPENDENCIES
mysql2 mysql2
newrelic_rpm newrelic_rpm
puma puma
rails (= 5.1.4) rails (= 5.2.0)
rails_12factor rails_12factor
rb-readline rb-readline
round_robin_tournament round_robin_tournament
@@ -212,7 +220,7 @@ DEPENDENCIES
uglifier uglifier
RUBY VERSION RUBY VERSION
ruby 2.4.2p198 ruby 2.5.1p57
BUNDLED WITH BUNDLED WITH
1.16.1 1.16.1

View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash -e
project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))" project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
docker build -f ${project_dir}/deploy/rails-prod-Dockerfile -t wrestlingdevtests ${project_dir}/. docker build -f ${project_dir}/deploy/rails-prod-Dockerfile -t wrestlingdevtests ${project_dir}/.

Binary file not shown.

View File

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

View File

@@ -1,4 +1,4 @@
FROM ruby:2.4.2 FROM ruby:2.5.1
RUN apt-get -qq update \ RUN apt-get -qq update \
&& DEBIAN_FRONTEND=noninteractive apt-get -qq upgrade -y \ && DEBIAN_FRONTEND=noninteractive apt-get -qq upgrade -y \
@@ -53,7 +53,8 @@ RUN gem install --no-rdoc --no-ri bundler
WORKDIR /tmp WORKDIR /tmp
COPY Gemfile Gemfile COPY Gemfile Gemfile
COPY Gemfile.lock Gemfile.lock COPY Gemfile.lock Gemfile.lock
RUN bundle install --without test #RUN bundle install --without test
RUN bundle install
# Copy site into place. # Copy site into place.
RUN mkdir /rails RUN mkdir /rails