From 7962af41fd27d8d5f6b32a966fbd5689b60170b7 Mon Sep 17 00:00:00 2001 From: Mike Korcynski Date: Wed, 11 Sep 2024 10:02:58 -0400 Subject: [PATCH] change ruby to 2.7.7 remove imei from dockerfile --- .github/workflows/ci.yml | 2 +- Dockerfile | 4 +-- Gemfile | 2 +- Gemfile.lock | 68 +++++++++++++++++++--------------------- 4 files changed, 37 insertions(+), 39 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3fdbe2ac..25e33cf0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: strategy: fail-fast: false matrix: - ruby-version: ['2.7.5'] + ruby-version: ['2.7.7'] steps: - name: Pin chrome uses: abhi1693/setup-browser@v0.3.4 diff --git a/Dockerfile b/Dockerfile index 44fd2fc1..0d16cd27 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7.5 +FROM ruby:2.7.7 ARG RAILS_ENV ARG SECRET_KEY_BASE @@ -36,7 +36,7 @@ RUN npm install -g yarn RUN apt-get remove -y imagemagick RUN apt-get install -y wget -RUN t=$(mktemp) && wget 'https://dist.1-2.dev/imei.sh' -qO "$t" && bash "$t" && rm "$t" # https://github.com/SoftCreatR/imei#one-step-automated-install +# RUN t=$(mktemp) && wget 'https://dist.1-2.dev/imei.sh' -qO "$t" && bash "$t" && rm "$t" # https://github.com/SoftCreatR/imei#one-step-automated-install # fetch clamav local database # initial update of av databases diff --git a/Gemfile b/Gemfile index ffce35ca..4fe151eb 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ # frozen_string_literal: true source 'https://rubygems.org' -ruby '2.7.5' +ruby '2.7.7' git_source(:github) do |repo_name| repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") diff --git a/Gemfile.lock b/Gemfile.lock index 0b6c24b2..3d36142a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,15 +72,15 @@ GEM redlock (>= 1.2, < 2) activemodel (5.2.8.1) activesupport (= 5.2.8.1) - activemodel-serializers-xml (1.0.2) - activemodel (> 5.x) - activesupport (> 5.x) + activemodel-serializers-xml (1.0.3) + activemodel (>= 5.0.0.a) + activesupport (>= 5.0.0.a) builder (~> 3.1) activerecord (5.2.8.1) activemodel (= 5.2.8.1) activesupport (= 5.2.8.1) arel (>= 9.0) - activerecord-import (1.7.0) + activerecord-import (1.8.1) activerecord (>= 4.2) activestorage (5.2.8.1) actionpack (= 5.2.8.1) @@ -100,23 +100,23 @@ GEM ast (2.4.2) autoprefixer-rails (10.4.19.0) execjs (~> 2) - awesome_nested_set (3.6.0) - activerecord (>= 4.0.0, < 7.2) + awesome_nested_set (3.7.0) + activerecord (>= 4.0.0, < 8.0) aws-eventstream (1.3.0) - aws-partitions (1.963.0) - aws-sdk-core (3.201.4) + aws-partitions (1.977.0) + aws-sdk-core (3.208.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.88.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-kms (1.93.0) + aws-sdk-core (~> 3, >= 3.207.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.157.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-s3 (1.165.0) + aws-sdk-core (~> 3, >= 3.207.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sigv4 (1.9.1) + aws-sigv4 (1.10.0) aws-eventstream (~> 1, >= 1.0.2) babel-source (5.8.35) babel-transpiler (0.7.0) @@ -161,13 +161,13 @@ GEM actionpack (>= 5.0) activemodel (>= 5.0) breadcrumbs_on_rails (3.0.1) - browse-everything (1.3.0) + browse-everything (1.4.0) addressable (~> 2.5) aws-sdk-s3 dropbox_api (>= 0.1.20) google-apis-drive_v3 googleauth (>= 0.6.6, < 2.0) - rails (>= 4.2, < 7.2) + rails (>= 4.2, < 8.0) ruby-box signet (~> 0.8) typhoeus @@ -479,12 +479,12 @@ GEM signet tinymce-rails (~> 5.10) valkyrie (~> 2, >= 2.1.1) - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) ice_nine (0.11.2) iiif_manifest (1.6.0) activesupport (>= 4) - jbuilder (2.12.0) + jbuilder (2.13.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) jmespath (1.6.2) @@ -511,9 +511,9 @@ GEM json-ld-preloaded (3.1.6) json-ld (~> 3.1) rdf (~> 3.1) - json-schema (4.3.1) - addressable (>= 2.8) - jwt (2.8.2) + json-schema (5.0.0) + addressable (~> 2.8) + jwt (2.9.1) base64 kaminari (1.2.2) activesupport (>= 4.1.0) @@ -588,7 +588,7 @@ GEM listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - logger (1.6.0) + logger (1.6.1) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -605,23 +605,23 @@ GEM method_source (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.0903) mimemagic (0.3.10) nokogiri (~> 1) rake mini_magick (4.13.2) mini_mime (1.1.5) mini_portile2 (2.8.7) - minitest (5.25.0) + minitest (5.25.1) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.4.1) mysql2 (0.5.2) nest (3.2.0) redic - net-http-persistent (4.0.2) + net-http-persistent (4.0.4) connection_pool (~> 2.2) - net-imap (0.4.14) + net-imap (0.4.16) date net-protocol net-ldap (0.16.1) @@ -686,14 +686,14 @@ GEM public_suffix (5.1.1) puma (5.6.4) nio4r (~> 2.0) - qa (5.12.0) + qa (5.13.0) activerecord-import deprecation faraday (< 3.0, != 2.0.0) geocoder ldpath nokogiri (~> 1.6) - rails (>= 5.0, < 7.2) + rails (>= 5.0, < 8.0) rdf racc (1.8.1) rack (2.2.9) @@ -830,8 +830,7 @@ GEM actionpack (>= 5.0) railties (>= 5.0) retriable (3.1.2) - rexml (3.3.5) - strscan + rexml (3.3.7) rmagick (4.2.6) rsolr (2.6.0) builder (>= 2.1.2) @@ -984,7 +983,6 @@ GEM sprockets (>= 3.0.0) sqlite3 (1.4.1) ssrf_filter (1.0.8) - strscan (3.1.0) sxp (1.2.4) matrix (~> 0.4) rdf (~> 3.2) @@ -996,7 +994,7 @@ GEM therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - thor (1.3.1) + thor (1.3.2) thread_safe (0.3.6) tilt (2.4.0) timeout (0.4.1) @@ -1019,7 +1017,7 @@ GEM uglifier (4.1.20) execjs (>= 0.3.0, < 3) unicode-display_width (1.8.0) - unicode-types (1.9.0) + unicode-types (1.10.0) valkyrie (2.2.0) activemodel activesupport @@ -1051,7 +1049,7 @@ GEM rexml xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.17) + zeitwerk (2.6.18) PLATFORMS ruby @@ -1125,7 +1123,7 @@ DEPENDENCIES whenever RUBY VERSION - ruby 2.7.5p203 + ruby 2.7.7p221 BUNDLED WITH 2.2.32