Merge pull request #408 from sul-dlss/update-dependencies

Update dependencies
sul-dlss-deprecated · Mar 16, 2020 · 5515a67 · 5515a67
2 parents 2f9e69d + f35a0c1
commit 5515a67
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,12 +10,6 @@ services:
   - docker
 
 before_install:
-  # Travis's docker-compose is too old to handle v3.6 docker-compose templates.
-  # This code is from Travis's documentation: https://docs.travis-ci.com/user/docker/#using-docker-compose
-  - sudo rm /usr/local/bin/docker-compose
-  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
-  - chmod +x docker-compose
-  - sudo mv docker-compose /usr/local/bin
   - docker-compose up -d
   - docker-compose ps
   - yes | gem update --system
@@ -26,7 +20,6 @@ before_script:
 
 env:
   global:
-    - DOCKER_COMPOSE_VERSION=1.23.1
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 
 rvm:

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -77,7 +77,7 @@ GEM
       docopt (~> 0.5.0)
       validatable (~> 1.6)
     bcrypt (3.1.13)
-    blacklight (6.22.0)
+    blacklight (6.23.0)
       bootstrap-sass (~> 3.2)
       deprecation
       globalid
@@ -100,7 +100,7 @@ GEM
       thor (~> 0.18)
     byebug (11.1.1)
     cancancan (1.17.0)
-    capistrano (3.12.0)
+    capistrano (3.12.1)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
@@ -232,33 +232,33 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
-    dry-schema (1.4.3)
+    dry-schema (1.5.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.8, >= 0.8.3)
       dry-core (~> 0.4)
       dry-equalizer (~> 0.2)
       dry-initializer (~> 3.0)
       dry-logic (~> 1.0)
-      dry-types (~> 1.2)
+      dry-types (~> 1.4)
     dry-struct (1.3.0)
       dry-core (~> 0.4, >= 0.4.4)
       dry-equalizer (~> 0.3)
       dry-types (~> 1.3)
       ice_nine (~> 0.11)
-    dry-types (1.3.1)
+    dry-types (1.4.0)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
       dry-core (~> 0.4, >= 0.4.4)
       dry-equalizer (~> 0.3)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    dry-validation (1.4.2)
+    dry-validation (1.5.0)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.7, >= 0.7.1)
       dry-core (~> 0.4)
       dry-equalizer (~> 0.2)
       dry-initializer (~> 3.0)
-      dry-schema (~> 1.4, >= 1.4.3)
+      dry-schema (~> 1.5)
     dynamic_form (1.1.4)
     edtf (3.0.5)
       activesupport (>= 3.0, < 7.0)
@@ -281,7 +281,7 @@ GEM
     haml (5.1.2)
       temple (>= 0.8.0)
       tilt
-    honeybadger (4.5.6)
+    honeybadger (4.6.0)
     hooks (0.4.1)
       uber (~> 0.0.14)
     htmlentities (4.3.4)
@@ -448,13 +448,13 @@ GEM
       faraday (>= 0.9.0)
     rspec-core (3.9.1)
       rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-rails (3.9.0)
+    rspec-rails (3.9.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -550,7 +550,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.6)
-    unicode-display_width (1.6.1)
+    unicode-display_width (1.7.0)
     validatable (1.6.7)
     validates_email_format_of (1.6.3)
       i18n

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -28,7 +28,7 @@ services:
     environment:
       - POSTGRES_PASSWORD=sekret
     volumes:
-      - ./postgres-data:/var/lib/postgresql/data
+      - postgres-data:/var/lib/postgresql/data
 
   redis:
     image: redis
@@ -67,12 +67,38 @@ services:
       DATABASE_PASSWORD: sekret
       DATABASE_HOSTNAME: db
       DATABASE_PORT: 5432
-#      SOLR_URL: http://solr:8983/solr/hydrus-test
-      SETTINGS__solr__url: http://solr:8983/solr/hydrus-test
+      SETTINGS__SOLR__URL: http://solr:8983/solr/hydrus-test
       SETTINGS__FEDORA_URL: http://fedoraAdmin:fedoraAdmin@fcrepo:8080/fedora
       SETTINGS__SURI__URL: http://suri:3000
       SETTINGS__WORKFLOW_URL: http://workflow:3000
+      SETTINGS__DOR_INDEXING__URL: http://dor-indexing-app:3000/dor
       SETTINGS__DOR__SERVICE_USER: dor-service-user
       SETTINGS__DOR__SERVICE_PASSWORD: dor-service-password
     depends_on:
       - db
+      - dor-indexing-app
+      - fcrepo
+      - solr
+      - suri
+      - workflow
+
+  dor-indexing-app:
+    image: suldlss/dor-indexing-app:latest
+    ports:
+      - 3004:3000
+    environment:
+      SOLR_URL: http://solr:8983/solr/hydrus-test
+      SETTINGS__SOLR__URL: http://solr:8983/solr/hydrus-test
+      SETTINGS__DOR_SERVICES__URL: http://dor-services-app:3000/
+      # To generate the token: docker-compose run dor-services-app rake generate_token
+      SETTINGS__DOR_SERVICES__TOKEN: eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJGb28ifQ.-BVfLTW9Q1_ZQEsGv4tuzGLs5rESN7LgdtEwUltnKv4
+      SETTINGS__FEDORA_URL: http://fedoraAdmin:fedoraAdmin@fcrepo:8080/fedora
+      SETTINGS__SOLRIZER_URL: http://solr:8983/solr/hydrus-test
+      SETTINGS__WORKFLOW_URL: http://workflow:3000
+    depends_on:
+      - solr
+      - fcrepo
+      - workflow
+
+volumes:
+  postgres-data: