From b4304387fe5fa068cf896d77c850f26f063608fa Mon Sep 17 00:00:00 2001 From: Alex Skrenchuk Date: Mon, 4 Mar 2024 14:12:48 -0800 Subject: [PATCH] add ruby v3.0 support --- Gemfile.lock | 21 +++++++++++---------- docker-compose.yml | 6 +++--- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1e00bde8..b48ddd6d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,7 +36,6 @@ GEM public_suffix (>= 2.0.2, < 6.0) ansi (1.5.0) ast (2.4.2) - base64 (0.2.0) bcrypt (3.1.20) bigdecimal (3.1.6) builder (3.2.4) @@ -53,11 +52,10 @@ GEM launchy (~> 2.1) mail (~> 2.7) eventmachine (1.2.7) - faraday (2.8.1) - base64 - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) + faraday-net_http (3.1.0) + net-http ffi (1.16.3) hashie (5.0.0) htmlentities (4.3.4) @@ -92,8 +90,10 @@ GEM minitest (>= 2.12, < 5.0) powerbar multi_json (1.15.0) + net-http (0.4.1) + uri net-http-persistent (2.9.4) - net-imap (0.3.7) + net-imap (0.4.10) date net-protocol net-pop (0.1.2) @@ -129,7 +129,7 @@ GEM addressable (>= 2.2) redis (5.1.0) redis-client (>= 0.17.0) - redis-client (0.20.0) + redis-client (0.21.0) connection_pool regexp_parser (2.9.0) rest-client (2.1.0) @@ -155,7 +155,6 @@ GEM rubocop-ast (1.31.1) parser (>= 3.3.0.4) ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) rubyzip (1.3.0) simplecov (0.22.0) docile (~> 1.1) @@ -175,10 +174,12 @@ GEM timeout (0.4.1) tzinfo (0.3.62) unicode-display_width (2.5.0) + uri (0.13.0) uuid (2.3.9) macaddr (~> 1.0) PLATFORMS + aarch64-linux x86_64-darwin-18 DEPENDENCIES @@ -210,4 +211,4 @@ DEPENDENCIES thin BUNDLED WITH - 2.3.15 + 2.5.6 diff --git a/docker-compose.yml b/docker-compose.yml index 59bc4f8c..9736ae0b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,9 +2,9 @@ x-app: &app build: context: . args: - RUBY_VERSION: '2.7' + RUBY_VERSION: '3.0' # Increase the version number in the image tag every time Dockerfile or its arguments is changed - image: ontologies_ld-dev:0.0.2 + image: ontologies_ld-dev:0.0.3 environment: &env # default bundle config resolves to /usr/local/bundle/config inside of the container # we are setting it to local app directory if we need to use 'bundle config local' @@ -117,7 +117,7 @@ services: retries: 5 agraph-ut: - image: franzinc/agraph:v8.0.1 + image: franzinc/agraph:v8.1.0 platform: linux/amd64 environment: - AGRAPH_SUPER_USER=test