diff --git a/Dockerfile b/Dockerfile index ee764b87..bbc327ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,10 +14,6 @@ COPY Gemfile* /srv/ontoportal/ontologies_linked_data/ WORKDIR /srv/ontoportal/ontologies_linked_data -# set rubygem and bundler to the last version supported by ruby 2.7 -# remove version after ruby v3 upgrade -RUN gem update --system '3.4.22' -RUN gem install bundler -v 2.4.22 RUN gem update --system RUN gem install bundler ENV BUNDLE_PATH=/srv/ontoportal/bundle diff --git a/Gemfile.lock b/Gemfile.lock index 79d8e539..a8d79e60 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -33,47 +33,53 @@ GEM multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) ansi (1.5.0) ast (2.4.2) - base64 (0.2.0) bcrypt (3.1.20) bigdecimal (3.1.8) - builder (3.2.4) + builder (3.3.0) + childprocess (5.1.0) + logger (~> 1.5) coderay (1.1.3) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) cube-ruby (0.0.3) daemons (1.4.1) date (3.3.4) - docile (1.4.0) + docile (1.4.1) domain_name (0.6.20240107) - email_spec (2.2.2) + email_spec (2.3.0) htmlentities (~> 4.3.3) - launchy (~> 2.1) + launchy (>= 2.1, < 4.0) 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) - ffi (1.16.3) + faraday (2.12.0) + faraday-net_http (>= 2.0, < 3.4) + json + logger + faraday-net_http (3.3.0) + net-http + ffi (1.17.0-aarch64-linux-gnu) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86_64-darwin) + ffi (1.17.0-x86_64-linux-gnu) hashie (5.0.0) htmlentities (4.3.4) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.7) domain_name (~> 0.5) i18n (0.9.5) concurrent-ruby (~> 1.0) json (2.7.2) json_pure (2.7.2) language_server-protocol (3.17.0.3) - launchy (2.5.2) + launchy (3.0.1) addressable (~> 2.8) + childprocess (~> 5.0) libxml-ruby (5.0.3) - logger (1.6.0) + logger (1.6.1) macaddr (1.7.2) systemu (~> 2.6.5) mail (2.8.1) @@ -84,7 +90,7 @@ GEM method_source (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0507) + mime-types-data (3.2024.0903) mini_mime (1.1.5) minitest (4.7.5) minitest-reporters (0.14.24) @@ -93,8 +99,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.4.11) + net-imap (0.4.16) date net-protocol net-pop (0.1.2) @@ -104,12 +112,14 @@ GEM net-smtp (0.5.0) net-protocol netrc (0.11.0) - oj (3.16.3) + oj (3.16.6) bigdecimal (>= 3.0) + ostruct (>= 0.2) omni_logger (0.1.4) logger - parallel (1.24.0) - parser (3.3.1.0) + ostruct (0.6.0) + parallel (1.26.3) + parser (3.3.5.0) ast (~> 2.4.1) racc pony (1.13.1) @@ -119,8 +129,8 @@ GEM pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (5.0.5) - racc (1.8.0) + public_suffix (6.0.1) + racc (1.8.1) rack (2.2.9) rack-test (0.8.3) rack (>= 1.0, < 3) @@ -128,9 +138,9 @@ GEM rake (10.5.0) rdf (1.0.8) addressable (>= 2.2) - redis (5.2.0) + redis (5.3.0) redis-client (>= 0.22.0) - redis-client (0.22.1) + redis-client (0.22.2) connection_pool regexp_parser (2.9.2) request_store (1.7.0) @@ -140,26 +150,23 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.8) - strscan (>= 3.0.9) + rexml (3.3.7) rsolr (2.6.0) builder (>= 2.1.2) faraday (>= 0.9, < 3, != 2.0.0) - rubocop (1.63.5) + rubocop (1.66.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.31.1, < 2.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.3) + rubocop-ast (1.32.3) parser (>= 3.3.1.0) ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) rubyzip (1.3.0) simplecov (0.22.0) docile (~> 1.1) @@ -168,9 +175,8 @@ GEM simplecov-cobertura (2.1.0) rexml simplecov (~> 0.19) - simplecov-html (0.12.3) + simplecov-html (0.13.1) simplecov_json_formatter (0.1.4) - strscan (3.1.0) systemu (2.6.5) thin (1.8.2) daemons (~> 1.0, >= 1.0.9) @@ -179,12 +185,14 @@ GEM thread_safe (0.3.6) timeout (0.4.1) tzinfo (0.3.62) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) + uri (0.13.1) uuid (2.3.9) macaddr (~> 1.0) PLATFORMS aarch64-linux + arm64-darwin-22 x86_64-darwin-21 x86_64-darwin-23 x86_64-linux 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