From 62638a601bc22a93bcd2f02a537db39ad2ca71a8 Mon Sep 17 00:00:00 2001 From: Martin Fenner Date: Sat, 15 Jun 2019 14:18:01 +0200 Subject: [PATCH] clean up bundler install --- .travis.yml | 2 +- Dockerfile | 4 ++-- Gemfile.lock | 27 +++++++++++++-------------- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index a86ca9477..76de489d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: -- 2.5.3 +- 2.4.4 sudo: required dist: trusty diff --git a/Dockerfile b/Dockerfile index 8b56879af..da37d574e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,8 @@ RUN usermod -a -G docker_env app # Use baseimage-docker's init process. CMD ["/sbin/my_init"] -# Install Ruby 2.5.3 -RUN bash -lc 'rvm --default use ruby-2.5.3' +# Install Ruby 2.4.4 +RUN bash -lc 'rvm --default use ruby-2.4.4' # Update installed APT packages RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \ diff --git a/Gemfile.lock b/Gemfile.lock index b2d5c70c5..129d05bea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,8 +64,8 @@ GEM audited (4.8.0) activerecord (>= 4.0, < 5.3) aws-eventstream (1.0.3) - aws-partitions (1.173.0) - aws-sdk-core (3.54.2) + aws-partitions (1.175.0) + aws-sdk-core (3.55.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1.0) aws-sigv4 (~> 1.1) @@ -133,7 +133,7 @@ GEM builder (3.2.3) byebug (11.0.1) cancancan (2.3.0) - capybara (3.22.0) + capybara (3.24.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -266,7 +266,7 @@ GEM json-ld (~> 3.0) multi_json (~> 1.12) rdf (~> 3.0) - jsonapi-renderer (0.2.0) + jsonapi-renderer (0.2.2) jsonlint (0.2.0) oj (~> 2) trollop (~> 2) @@ -326,7 +326,7 @@ GEM mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.11.3) - money (6.13.3) + money (6.13.4) i18n (>= 0.6.4, <= 2) msgpack (1.2.10) multi_json (1.13.1) @@ -429,12 +429,12 @@ GEM benchmark-perf (~> 0.4.0) benchmark-trend (~> 0.2.0) rspec (>= 3.0.0, < 4.0.0) - rspec-core (3.8.0) + rspec-core (3.8.1) rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec-expectations (3.8.4) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-mocks (3.8.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) rspec-rails (3.8.2) @@ -445,7 +445,7 @@ GEM rspec-expectations (~> 3.8.0) rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-support (3.8.2) rubocop (0.68.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -478,8 +478,7 @@ GEM slack-notifier (2.3.2) sort_alphabetical (1.1.0) unicode_utils (>= 1.2.2) - spring (2.0.2) - activesupport (>= 4.2) + spring (2.1.0) spring-commands-rspec (1.0.4) spring (>= 0.9.1) spring-watcher-listen (2.0.1) @@ -519,9 +518,9 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket-driver (0.7.0) + websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) + websocket-extensions (0.1.4) xpath (3.2.0) nokogiri (~> 1.8) @@ -611,4 +610,4 @@ DEPENDENCIES webmock (~> 3.1) BUNDLED WITH - 2.0.1 + 2.0.2