From 5c9ef31f178dfa8300f7b845e365db0ca115f360 Mon Sep 17 00:00:00 2001 From: Sarah Wiechers Date: Mon, 4 Apr 2022 14:47:54 +0200 Subject: [PATCH] Upgraded Rails version. --- .ruby-version | 2 +- Dockerfile | 9 +- Gemfile | 4 +- Gemfile.lock | 336 +++++++++++++++++++++++++------------------------- 4 files changed, 181 insertions(+), 170 deletions(-) diff --git a/.ruby-version b/.ruby-version index e261122d..24ba9a38 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.7 +2.7.0 diff --git a/Dockerfile b/Dockerfile index d67dd0c0..1c3710c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,9 @@ FROM ruby:2.7.0 LABEL maintainer="BarKeeper (Kai Müller, Sarah Wiechers)" +RUN addgroup --gid 1000 barkeeper +RUN adduser --disabled-password --gecos '' --uid 1000 --gid 1000 barkeeper + ARG PUMA_PORT RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs cmake @@ -10,10 +13,12 @@ ENV RAILS_ROOT /var/www/barkeeper RUN mkdir -p $RAILS_ROOT WORKDIR $RAILS_ROOT -RUN gem install rails bundler +ENV BUNDLER_VERSION=2.3.5 +RUN gem install rails bundler:2.3.5 COPY Gemfile Gemfile -COPY Gemfile.lock Gemfile.lock + RUN bundle install +RUN chown -R barkeeper:barkeeper $RAILS_ROOT RUN bundle exec rails assets:precompile EXPOSE $PUMA_PORT diff --git a/Gemfile b/Gemfile index 6834c55e..86ac09d3 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' ruby '2.7.0' -gem 'rails', '5.2.4.6' +gem 'rails', '5.2.7' # Postgres gem 'pg' @@ -67,7 +67,7 @@ group :development do gem 'binding_of_caller' # Extends features of better_errors gem 'meta_request' # Supporting gem for Google Chrome Rails Panel gem 'licensed' # Check compatibility of gem licenses - gem 'spring' # Spring speeds up development by keeping your application running in the background + gem 'spring', '~> 3' # Spring speeds up development by keeping your application running in the background gem 'yard' # Documentation generation tool end diff --git a/Gemfile.lock b/Gemfile.lock index 960b6eab..0f6ee1cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,93 +11,97 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.2.4.6) - actionpack (= 5.2.4.6) + actioncable (5.2.7) + actionpack (= 5.2.7) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.4.6) - actionpack (= 5.2.4.6) - actionview (= 5.2.4.6) - activejob (= 5.2.4.6) + actionmailer (5.2.7) + actionpack (= 5.2.7) + actionview (= 5.2.7) + activejob (= 5.2.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.4.6) - actionview (= 5.2.4.6) - activesupport (= 5.2.4.6) + actionpack (5.2.7) + actionview (= 5.2.7) + activesupport (= 5.2.7) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.4.6) - activesupport (= 5.2.4.6) + actionview (5.2.7) + activesupport (= 5.2.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - active_storage_validations (0.9.5) - rails (>= 5.2.0) - activejob (5.2.4.6) - activesupport (= 5.2.4.6) + active_storage_validations (0.9.7) + activejob (>= 5.2.0) + activemodel (>= 5.2.0) + activestorage (>= 5.2.0) + activesupport (>= 5.2.0) + activejob (5.2.7) + activesupport (= 5.2.7) globalid (>= 0.3.6) - activemodel (5.2.4.6) - activesupport (= 5.2.4.6) - activerecord (5.2.4.6) - activemodel (= 5.2.4.6) - activesupport (= 5.2.4.6) + activemodel (5.2.7) + activesupport (= 5.2.7) + activerecord (5.2.7) + activemodel (= 5.2.7) + activesupport (= 5.2.7) arel (>= 9.0) - activestorage (5.2.4.6) - actionpack (= 5.2.4.6) - activerecord (= 5.2.4.6) - marcel (~> 0.3.1) - activesupport (5.2.4.6) + activestorage (5.2.7) + actionpack (= 5.2.7) + activerecord (= 5.2.7) + marcel (~> 1.0.0) + activesupport (5.2.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - ancestry (4.0.0) - activerecord (>= 5.2.4.5) + ancestry (4.1.0) + activerecord (>= 5.2.6) arel (9.0.0) - autoprefixer-rails (10.2.5.1) - execjs (> 0) - aws-eventstream (1.1.1) - aws-partitions (1.479.0) - aws-sdk-core (3.117.0) + autoprefixer-rails (10.4.2.0) + execjs (~> 2) + aws-eventstream (1.2.0) + aws-partitions (1.573.0) + aws-sdk-core (3.130.0) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) + aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.44.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kms (1.55.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.96.1) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-s3 (1.113.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.4) + aws-sigv4 (~> 1.4) + aws-sigv4 (1.4.0) aws-eventstream (~> 1, >= 1.0.2) - bcrypt (3.1.16) + bcrypt (3.1.17) better_errors (2.9.1) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bio (2.0.2) - bootsnap (1.7.5) - msgpack (~> 1.0) + bio (2.0.3) + bootsnap (1.11.1) + msgpack (~> 1.2) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) bootstrap_progressbar (0.2.0) builder (3.2.4) - bullet (6.1.4) + bullet (7.0.1) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) cancancan (3.3.0) - capybara (3.35.3) + capybara (3.36.0) addressable + matrix mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) @@ -108,9 +112,9 @@ GEM capybara selenium-webdriver charlock_holmes (0.7.7) - childprocess (3.0.0) + childprocess (4.1.0) chronic (0.10.2) - cli (1.3.1) + cli (1.4.0) coderay (1.1.3) coffee-rails (5.0.0) coffee-script (>= 2.2.0) @@ -119,7 +123,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) connection_pool (2.2.5) copyright-header (1.0.22) github-linguist @@ -131,52 +135,57 @@ GEM database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) debug_inspector (1.1.0) - devise (4.8.0) + devise (4.8.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - diff-lcs (1.4.4) + diff-lcs (1.5.0) docile (1.4.0) dotenv (2.7.6) erubi (1.10.0) escape_utils (1.2.1) execjs (2.8.1) - factory_bot (6.2.0) + factory_bot (6.2.1) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faker (2.18.0) - i18n (>= 1.6, < 2) - faraday (1.5.1) + faker (2.20.0) + i18n (>= 1.8.11, < 2) + faraday (1.10.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) + faraday-net_http_persistent (~> 1.0) faraday-patron (~> 1.0) - multipart-post (>= 1.2, < 3) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) + faraday-multipart (1.0.3) + multipart-post (>= 1.2, < 3) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) - ffi (1.15.3) - ffi (1.15.3-x86-mingw32) - formatador (0.3.0) - github-linguist (7.15.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + ffi (1.15.5) + formatador (1.1.0) + github-linguist (7.20.0) charlock_holmes (~> 0.7.7) escape_utils (~> 1.2.0) mini_mime (~> 1.0) - rugged (>= 0.25.1) - globalid (0.4.2) - activesupport (>= 4.2.0) + rugged (~> 1.0) + globalid (1.0.0) + activesupport (>= 5.0) guard (2.18.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) @@ -191,14 +200,15 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - i18n (1.8.10) + i18n (1.10.0) concurrent-ruby (~> 1.0) - image_processing (1.12.1) + image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) - jbuilder (2.11.2) + jbuilder (2.11.5) + actionview (>= 5.0.0) activesupport (>= 5.0.0) - jmespath (1.4.0) + jmespath (1.6.1) jquery-fileupload-rails (1.0.0) actionpack (>= 3.1) railties (>= 3.1) @@ -211,47 +221,43 @@ GEM railties (>= 3.2.16) launchy (2.5.0) addressable (~> 2.7) - licensed (3.1.0) + licensed (3.6.0) bundler (>= 1.10) - licensee (>= 9.14.0, < 10.0.0) + licensee (>= 9.15.2, < 10.0.0) parallel (>= 0.18.0) pathname-common_prefix (~> 0.0.1) - reverse_markdown (~> 1.0) + reverse_markdown (>= 1, < 3) ruby-xxHash (~> 0.4) thor (>= 0.19) - tomlrb (~> 1.2) - licensee (9.15.1) + tomlrb (>= 1.2, < 3.0) + licensee (9.15.2) dotenv (~> 2.0) octokit (~> 4.20) reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - listen (3.5.1) + listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.10.0) + loofah (2.16.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.2.8) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) - meta_request (0.7.2) + marcel (1.0.2) + matrix (0.4.2) + meta_request (0.7.3) rack-contrib (>= 1.1, < 3) railties (>= 3.0.0, < 7) method_source (1.0.0) - mime-types (3.3.1) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0704) - mimemagic (0.3.10) - nokogiri (~> 1) - rake + mime-types-data (3.2022.0105) mini_magick (4.11.0) - mini_mime (1.1.0) - mini_portile2 (2.5.3) - minitest (5.14.4) - msgpack (1.4.2) + mini_mime (1.1.2) + minitest (5.15.0) + msgpack (1.4.5) multipart-post (2.1.1) mustermann (1.1.1) ruby2_keywords (~> 0.0.1) @@ -265,111 +271,108 @@ GEM net-sftp (3.0.0) net-ssh (>= 5.0.0, < 7.0.0) net-ssh (6.1.0) - nio4r (2.5.7) - nokogiri (1.11.7) - mini_portile2 (~> 2.5.0) - racc (~> 1.4) - nokogiri (1.11.7-x86-mingw32) + nio4r (2.5.8) + nokogiri (1.13.3-x86_64-linux) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) - octokit (4.21.0) + octokit (4.22.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) orm_adapter (0.5.0) - parallel (1.20.1) + parallel (1.22.1) pathname-common_prefix (0.0.1) - pg (1.2.3) - pg (1.2.3-x86-mingw32) - pg_search (2.3.5) + pg (1.3.5) + pg_search (2.3.6) activerecord (>= 5.2) activesupport (>= 5.2) pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.6) - puma (5.3.2) + puma (5.6.4) nio4r (~> 2.0) - racc (1.5.2) + racc (1.6.0) rack (2.2.3) rack-contrib (2.3.0) rack (~> 2.0) - rack-protection (2.1.0) + rack-protection (2.2.0) rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.4.6) - actioncable (= 5.2.4.6) - actionmailer (= 5.2.4.6) - actionpack (= 5.2.4.6) - actionview (= 5.2.4.6) - activejob (= 5.2.4.6) - activemodel (= 5.2.4.6) - activerecord (= 5.2.4.6) - activestorage (= 5.2.4.6) - activesupport (= 5.2.4.6) + rails (5.2.7) + actioncable (= 5.2.7) + actionmailer (= 5.2.7) + actionpack (= 5.2.7) + actionview (= 5.2.7) + activejob (= 5.2.7) + activemodel (= 5.2.7) + activerecord (= 5.2.7) + activestorage (= 5.2.7) + activesupport (= 5.2.7) bundler (>= 1.3.0) - railties (= 5.2.4.6) + railties (= 5.2.7) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.2) loofah (~> 2.3) - railties (5.2.4.6) - actionpack (= 5.2.4.6) - activesupport (= 5.2.4.6) + railties (5.2.7) + actionpack (= 5.2.7) + activesupport (= 5.2.7) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rake (13.0.6) - rb-fsevent (0.11.0) + rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) - redis (4.3.1) - redis-actionpack (5.2.0) - actionpack (>= 5, < 7) + redis (4.6.0) + redis-actionpack (5.3.0) + actionpack (>= 5, < 8) redis-rack (>= 2.1.0, < 3) redis-store (>= 1.1.0, < 2) - redis-activesupport (5.2.1) - activesupport (>= 3, < 7) + redis-activesupport (5.3.0) + activesupport (>= 3, < 8) redis-store (>= 1.3, < 2) - redis-rack (2.1.3) + redis-rack (2.1.4) rack (>= 2.0.8, < 3) redis-store (>= 1.2, < 2) redis-rails (5.0.2) redis-actionpack (>= 5.0, < 6) redis-activesupport (>= 5.0, < 6) redis-store (>= 1.2, < 2) - redis-store (1.9.0) + redis-store (1.9.1) redis (>= 4, < 5) - regexp_parser (2.1.1) + regexp_parser (2.2.1) responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) reverse_markdown (1.4.0) nokogiri - roo (2.8.3) + rexml (3.2.5) + roo (2.9.0) nokogiri (~> 1) rubyzip (>= 1.3.0, < 3.0.0) roo-xls (1.2.0) nokogiri roo (>= 2.0.0, < 3) spreadsheet (> 0.9.0) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rspec (3.11.0) + rspec-core (~> 3.11.0) + rspec-expectations (~> 3.11.0) + rspec-mocks (~> 3.11.0) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-support (~> 3.11.0) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-rails (5.0.1) + rspec-support (~> 3.11.0) + rspec-rails (5.1.1) actionpack (>= 5.2) activesupport (>= 5.2) railties (>= 5.2) @@ -377,14 +380,14 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) - rspec-support (3.10.2) + rspec-support (3.11.0) ruby-ole (1.2.12.2) - ruby-vips (2.1.2) + ruby-vips (2.1.4) ffi (~> 1.12) - ruby-xxHash (0.4.0.1) + ruby-xxHash (0.4.0.2) ruby2_keywords (0.0.5) rubyzip (2.3.2) - rugged (1.1.1) + rugged (1.4.2) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) sassc (2.4.0) @@ -399,22 +402,24 @@ GEM addressable (>= 2.3.5) faraday (> 0.8, < 2.0) select2-rails (4.0.13) - selenium-webdriver (3.142.7) - childprocess (>= 0.5, < 4.0) + selenium-webdriver (4.1.0) + childprocess (>= 0.5, < 5.0) + rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2) shellany (0.0.1) shoulda-callback-matchers (1.1.4) activesupport (>= 3) - shoulda-matchers (5.0.0) + shoulda-matchers (5.1.0) activesupport (>= 5.2.0) - sidekiq (6.2.1) + sidekiq (6.4.1) connection_pool (>= 2.2.2) rack (~> 2.0) redis (>= 4.2.0) sidekiq-client-cli (0.1.7) cli sidekiq (>= 2.15) - sidekiq-limit_fetch (3.4.0) + sidekiq-limit_fetch (4.1.0) + redis (>= 4.6.0) sidekiq (>= 4) simple_form (5.1.0) actionpack (>= 5.2) @@ -424,52 +429,53 @@ GEM simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) - simplecov_json_formatter (0.1.3) - sinatra (2.1.0) + simplecov_json_formatter (0.1.4) + sinatra (2.2.0) mustermann (~> 1.0) rack (~> 2.2) - rack-protection (= 2.1.0) + rack-protection (= 2.2.0) tilt (~> 2.0) - spreadsheet (1.2.9) + spreadsheet (1.3.0) ruby-ole - spring (2.1.1) - sprockets (4.0.2) + spring (3.1.1) + sprockets (4.0.3) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) - thor (1.1.0) + thor (1.2.1) thread_safe (0.3.6) tilt (2.0.10) - tomlrb (1.3.0) + tomlrb (2.0.1) tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - uniform_notifier (1.14.2) + uniform_notifier (1.16.0) warden (1.2.9) rack (>= 2.0.9) - webdrivers (4.6.0) + webdrivers (5.0.0) nokogiri (~> 1.6) rubyzip (>= 1.3.0) - selenium-webdriver (>= 3.0, < 4.0) + selenium-webdriver (~> 4.0) + webrick (1.7.0) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) whenever (1.0.0) chronic (>= 0.6.3) - will_paginate (3.3.0) + will_paginate (3.3.1) will_paginate-bootstrap (1.0.2) will_paginate (>= 3.0.3) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.26) + yard (0.9.27) + webrick (~> 1.7.0) PLATFORMS - ruby - x86-mingw32 + x86_64-linux DEPENDENCIES active_storage_validations @@ -511,7 +517,7 @@ DEPENDENCIES pg pg_search puma - rails (= 5.2.4.6) + rails (= 5.2.7) redis-rails roo-xls rspec-rails @@ -526,7 +532,7 @@ DEPENDENCIES simple_form simplecov sinatra - spring + spring (~> 3) sprockets-rails uglifier webdrivers