Skip to content

Commit

Permalink
Merge branch 'development' into feature/index-ontology-agent-metadata
Browse files Browse the repository at this point in the history
  • Loading branch information
syphax-bouazzouni committed Mar 6, 2024
2 parents 424f1a6 + cb9dfaf commit d163b68
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ gem 'sinatra', '~> 1.0'
gem 'sinatra-advanced-routes'
gem 'sinatra-contrib', '~> 1.0'
gem 'request_store'
gem 'addressable', '~> 2.8'
gem 'parallel'

# Rack middleware
gem 'ffi'
gem 'rack-accept', '~> 0.4'
Expand Down
16 changes: 9 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ GIT

GIT
remote: https://github.com/ontoportal-lirmm/goo.git
revision: 10b90c17af12c71bfc95bfb4fc0bba5e47ff77af
branch: feature/add-model-based-search
revision: 6c51346b6f150a69391794b7909b30592acbbe0e
branch: development
specs:
goo (0.0.2)
addressable (~> 2.8)
Expand Down Expand Up @@ -57,8 +57,8 @@ GIT

GIT
remote: https://github.com/ontoportal-lirmm/ontologies_linked_data.git
revision: 4e74b918119a246b908634c152b22a3f732d6abd
branch: feature/index-ontology-agent-metadata
revision: d37aeafbd7bef120917fb4d601f8287a9a859f69
branch: development
specs:
ontologies_linked_data (0.0.1)
activesupport
Expand Down Expand Up @@ -111,7 +111,7 @@ GEM
public_suffix (>= 2.0.2, < 6.0)
airbrussh (1.5.1)
sshkit (>= 1.6.1, != 1.7.0)
backports (3.24.1)
backports (3.25.0)
base64 (0.2.0)
bcrypt (3.1.20)
bcrypt_pbkdf (1.1.0)
Expand Down Expand Up @@ -233,7 +233,7 @@ GEM
json-schema (2.8.1)
addressable (>= 2.4)
json_pure (2.7.1)
jwt (2.8.0)
jwt (2.8.1)
base64
kgio (2.11.4)
libxml-ruby (5.0.2)
Expand All @@ -249,7 +249,7 @@ GEM
method_source (1.0.0)
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2024.0206)
mime-types-data (3.2024.0305)
mini_mime (1.1.5)
minitest (4.7.5)
minitest-stub_any_instance (1.0.3)
Expand Down Expand Up @@ -279,6 +279,7 @@ GEM
omni_logger (0.1.4)
logger
os (1.1.4)
parallel (1.24.0)
parseconfig (1.1.2)
pony (1.13.1)
mail (>= 2.0)
Expand Down Expand Up @@ -432,6 +433,7 @@ DEPENDENCIES
newrelic_rpm
oj (~> 2.0)
ontologies_linked_data!
parallel
parseconfig
pry
rack
Expand Down
10 changes: 4 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,10 @@ services:
- 4store

solr-ut:
image: solr:8
ports:
- 8983:8983
command: bin/solr start -cloud -f
# volumes:
#- solr_data:/var/solr/data
image: solr:8
ports:
- 8983:8983
command: bin/solr start -cloud -f
agraph-ut:
image: franzinc/agraph:v8.1.0
platform: linux/amd64
Expand Down

0 comments on commit d163b68

Please sign in to comment.