From c42dd1b9f6c55a75dcaea74a725e5f8703729ec7 Mon Sep 17 00:00:00 2001 From: Adam Cooke Date: Mon, 20 Feb 2023 09:57:56 +0000 Subject: [PATCH] upgrade ruby and various other dependencies --- .ruby-version | 3 +- Dockerfile | 15 +++---- Gemfile | 10 ++--- Gemfile.lock | 110 +++++++++++++++++++++++++------------------------- 4 files changed, 67 insertions(+), 71 deletions(-) diff --git a/.ruby-version b/.ruby-version index 12c4107..1f7da99 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1,2 +1 @@ -2.6.9 - +2.7.7 diff --git a/Dockerfile b/Dockerfile index 3c626bf..2447e4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,10 @@ -FROM ruby:2.6-buster AS base +FROM ruby:2.7.7-bullseye AS base SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN apt-get update \ && apt-get install -y --no-install-recommends \ software-properties-common dirmngr apt-transport-https \ - && apt-key adv --fetch-keys 'https://mariadb.org/mariadb_release_signing_key.asc' \ - && add-apt-repository 'deb [arch=amd64,arm64,ppc64el] https://mirrors.xtom.nl/mariadb/repo/10.6/debian buster main' \ - && (curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -) \ - && (echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list) \ - && (curl -sL https://deb.nodesource.com/setup_12.x | bash -) \ + && (curl -sL https://deb.nodesource.com/setup_14.x | bash -) \ && rm -rf /var/lib/apt/lists/* # Install main dependencies @@ -17,7 +13,8 @@ RUN apt-get update && \ build-essential \ netcat \ curl \ - libmariadbclient-dev \ + libmariadb-dev \ + libcap2-bin \ nano \ nodejs @@ -34,12 +31,12 @@ RUN mkdir -p /opt/postal/app /opt/postal/config WORKDIR /opt/postal/app # Install bundler -RUN gem install bundler -v 2.1.4 --no-doc +RUN gem install bundler -v 2.4.7 --no-doc # Install the latest and active gem dependencies and re-run # the appropriate commands to handle installs. COPY Gemfile Gemfile.lock ./ -RUN bundle install -j 4 +RUN bundle config set force_ruby_platform true && bundle install -j 4 # Copy the application (and set permissions) COPY ./docker/wait-for.sh /docker-entrypoint.sh diff --git a/Gemfile b/Gemfile index 624f97c..6fd707a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'rails', '= 5.2.6.2' +gem 'rails', '= 5.2.8.1' gem 'mysql2' gem 'puma' gem 'turbolinks', '~> 5' @@ -43,8 +43,8 @@ end group :development do gem 'annotate' - gem 'rspec' - gem 'rspec-rails' - gem "factory_bot_rails", "~> 4.0" - gem "database_cleaner" + gem 'rspec', require: false + gem 'rspec-rails', require: false + gem "factory_bot_rails", "~> 4.0", require: false + gem "database_cleaner", require: false end diff --git a/Gemfile.lock b/Gemfile.lock index 84d2fd9..c29f226 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,43 +9,43 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.2.6.2) - actionpack (= 5.2.6.2) + actioncable (5.2.8.1) + actionpack (= 5.2.8.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.6.2) - actionpack (= 5.2.6.2) - actionview (= 5.2.6.2) - activejob (= 5.2.6.2) + actionmailer (5.2.8.1) + actionpack (= 5.2.8.1) + actionview (= 5.2.8.1) + activejob (= 5.2.8.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.6.2) - actionview (= 5.2.6.2) - activesupport (= 5.2.6.2) + actionpack (5.2.8.1) + actionview (= 5.2.8.1) + activesupport (= 5.2.8.1) 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.6.2) - activesupport (= 5.2.6.2) + actionview (5.2.8.1) + activesupport (= 5.2.8.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.6.2) - activesupport (= 5.2.6.2) + activejob (5.2.8.1) + activesupport (= 5.2.8.1) globalid (>= 0.3.6) - activemodel (5.2.6.2) - activesupport (= 5.2.6.2) - activerecord (5.2.6.2) - activemodel (= 5.2.6.2) - activesupport (= 5.2.6.2) + activemodel (5.2.8.1) + activesupport (= 5.2.8.1) + activerecord (5.2.8.1) + activemodel (= 5.2.8.1) + activesupport (= 5.2.8.1) arel (>= 9.0) - activestorage (5.2.6.2) - actionpack (= 5.2.6.2) - activerecord (= 5.2.6.2) + activestorage (5.2.8.1) + actionpack (= 5.2.8.1) + activerecord (= 5.2.8.1) marcel (~> 1.0.0) - activesupport (5.2.6.2) + activesupport (5.2.8.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -77,7 +77,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.9) + concurrent-ruby (1.2.0) crass (1.0.6) database_cleaner (1.7.0) deep_merge (1.2.1) @@ -88,7 +88,7 @@ GEM railties (>= 3.2) dynamic_form (1.1.4) encrypto_signo (1.0.0) - erubi (1.10.0) + erubi (1.12.0) execjs (2.7.0) factory_bot (4.11.1) activesupport (>= 3.0.0) @@ -102,14 +102,14 @@ GEM thor (~> 0.19.1) gelf (3.0.0) json - globalid (1.0.0) + globalid (1.1.0) activesupport (>= 5.0) haml (5.1.2) temple (>= 0.8.0) tilt hashie (3.6.0) highline (2.0.0) - i18n (1.9.1) + i18n (1.12.0) concurrent-ruby (~> 1.0) jquery-rails (4.3.3) rails-dom-testing (>= 1, < 3) @@ -129,14 +129,14 @@ GEM activerecord kaminari-core (= 1.2.1) kaminari-core (1.2.1) - loofah (2.14.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) - mini_portile2 (2.7.1) - minitest (5.15.0) + mini_portile2 (2.8.1) + minitest (5.17.0) moonrope (2.0.2) deep_merge (~> 1.0) json @@ -148,36 +148,36 @@ GEM activerecord (>= 3.0.0) activesupport (>= 3.0.0) nio4r (2.5.8) - nokogiri (1.13.1) - mini_portile2 (~> 2.7.0) + nokogiri (1.14.2) + mini_portile2 (~> 2.8.0) racc (~> 1.4) - puma (5.6.2) + puma (6.1.0) nio4r (~> 2.0) - racc (1.6.0) - rack (2.2.3) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (5.2.6.2) - actioncable (= 5.2.6.2) - actionmailer (= 5.2.6.2) - actionpack (= 5.2.6.2) - actionview (= 5.2.6.2) - activejob (= 5.2.6.2) - activemodel (= 5.2.6.2) - activerecord (= 5.2.6.2) - activestorage (= 5.2.6.2) - activesupport (= 5.2.6.2) + racc (1.6.2) + rack (2.2.6.2) + rack-test (2.0.2) + rack (>= 1.3) + rails (5.2.8.1) + actioncable (= 5.2.8.1) + actionmailer (= 5.2.8.1) + actionpack (= 5.2.8.1) + actionview (= 5.2.8.1) + activejob (= 5.2.8.1) + activemodel (= 5.2.8.1) + activerecord (= 5.2.8.1) + activestorage (= 5.2.8.1) + activesupport (= 5.2.8.1) bundler (>= 1.3.0) - railties (= 5.2.6.2) + railties (= 5.2.8.1) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) - loofah (~> 2.3) - railties (5.2.6.2) - actionpack (= 5.2.6.2) - activesupport (= 5.2.6.2) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) + railties (5.2.8.1) + actionpack (= 5.2.8.1) + activesupport (= 5.2.8.1) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -236,7 +236,7 @@ GEM turbolinks (5.2.0) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (1.2.9) + tzinfo (1.2.11) thread_safe (~> 0.1) uglifier (4.1.18) execjs (>= 0.3.0, < 3) @@ -279,7 +279,7 @@ DEPENDENCIES nilify_blanks nio4r puma - rails (= 5.2.6.2) + rails (= 5.2.8.1) resolv (~> 0.2.1) rspec rspec-rails @@ -290,4 +290,4 @@ DEPENDENCIES uglifier (>= 1.3.0) BUNDLED WITH - 1.17.2 + 2.4.7