Merge branch 'development'

.github/workflows/deploy.yml

@@ -69,7 +69,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.6 # Not needed with a .ruby-version file
+          ruby-version: 2.7.8 # Not needed with a .ruby-version file
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
       - name: get-deployment-config
         uses: actions/checkout@v3

Gemfile

@@ -16,7 +16,7 @@ gem 'sinatra-contrib', '~> 1.0'
 gem 'request_store'
 gem 'parallel'
 gem 'json-ld'
-
+gem 'grpc', '1.64.0'
 
 # Rack middleware
 gem 'ffi'
@@ -47,7 +47,7 @@ gem 'redcarpet'
 
 # NCBO gems (can be from a local dev path or from rubygems/git)
 gem 'ncbo_annotator', git: 'https://github.com/ontoportal-lirmm/ncbo_annotator.git', branch: 'development'
-gem 'ncbo_cron', git: 'https://github.com/ontoportal-lirmm/ncbo_cron.git', branch: 'master'
+gem 'ncbo_cron', git: 'https://github.com/ontoportal-lirmm/ncbo_cron.git', branch: 'development'
 gem 'ncbo_ontology_recommender', git: 'https://github.com/ncbo/ncbo_ontology_recommender.git', branch: 'master'
 gem 'goo', github: 'ontoportal-lirmm/goo', branch: 'development'
 gem 'sparql-client', github: 'ontoportal-lirmm/sparql-client', branch: 'development'

Gemfile.lock

@@ -40,8 +40,8 @@ GIT
 
 GIT
   remote: https://github.com/ontoportal-lirmm/ncbo_cron.git
-  revision: fabd04ef4fa37989d526fc6a7aa1e98830008dae
-  branch: master
+  revision: 310ae5fef858d13917ff9fa6e59859998220c9b5
+  branch: development
   specs:
     ncbo_cron (0.0.1)
       dante
@@ -129,7 +129,7 @@ GEM
       capistrano (~> 3.1)
       sshkit (~> 1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     crack (1.0.0)
       bigdecimal
@@ -175,7 +175,7 @@ GEM
       grpc (~> 1.59)
     get_process_mem (0.2.7)
       ffi (~> 1.0)
-    google-analytics-data (0.6.0)
+    google-analytics-data (0.6.1)
       google-analytics-data-v1beta (>= 0.11, < 2.a)
       google-cloud-core (~> 1.6)
     google-analytics-data-v1beta (0.13.0)
@@ -211,8 +211,8 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    grpc (1.65.2-x86_64-linux)
-      google-protobuf (>= 3.25, < 5.0)
+    grpc (1.64.0-x86_64-linux)
+      google-protobuf (~> 3.25)
       googleapis-common-protos-types (~> 1.0)
     haml (5.2.2)
       temple (>= 0.8.0)
@@ -247,7 +247,7 @@ GEM
     method_source (1.1.0)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0702)
+    mime-types-data (3.2024.0806)
     mini_mime (1.1.5)
     minitest (4.7.5)
     minitest-stub_any_instance (1.0.3)
@@ -278,7 +278,7 @@ GEM
     omni_logger (0.1.4)
       logger
     os (1.1.4)
-    parallel (1.25.1)
+    parallel (1.26.2)
     parseconfig (1.1.2)
     pony (1.13.1)
       mail (>= 2.0)
@@ -327,7 +327,7 @@ GEM
     redis-rack-cache (2.2.1)
       rack-cache (>= 1.10, < 2)
       redis-store (>= 1.6, < 2)
-    redis-store (1.10.0)
+    redis-store (1.11.0)
       redis (>= 4, < 6)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -341,7 +341,7 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     retriable (3.1.2)
-    rexml (3.3.4)
+    rexml (3.3.5)
       strscan
     rsolr (2.6.0)
       builder (>= 2.1.2)
@@ -421,6 +421,7 @@ DEPENDENCIES
   faraday (~> 1.9)
   ffi
   goo!
+  grpc (= 1.64.0)
   haml (~> 5.2.2)
   json-ld
   json-schema (~> 2.0)

docker-compose.yml

@@ -49,7 +49,7 @@ services:
       - "9393:9393"
     volumes:
       # bundle volume for hosting gems installed by bundle; it speeds up gem install in local development
-      - .:/srv/ontoportal/ontologies_api
+      - app_api:/srv/ontoportal/ontologies_api
       - repository:/srv/ontoportal/data/repository
 
   ncbo_cron: