Merge branch '2019-11-08_hyrax_2.6'

.env.template

@@ -3,6 +3,7 @@ SOLR_URL_SCHEME=http
 SOLR_HOST=solr
 SOLR_PORT=8983
 SOLR_CORE=hyrax_production
+SOLR_TEST_PORT=8985
 
 # Database setting
 POSTGRES_HOST_APP=appdb
@@ -24,6 +25,7 @@ FEDORA_PORT=8080
 # FCREPO_ENDPOINT=hyrax_production # Optional - default is production
 # FCREPO_PATH='/rest' # Optional - default is /fcrepo/rest
 FCREPO_VERSION=4.7.5
+FEDORA_TEST_PORT=8986
 
 # RAILS setting
 LANG=C.UTF-8
@@ -46,6 +48,8 @@ GA_PRIVATE_KEY_SECRET=
 GA_CLIENT_EMAIL=
 
 # Hyrax application setting
+# NB: in macOS Catalina (10.15) the /srv/ path is not available to Docker
+HOST_APP_DATA_PATH=/srv/ngdr/data/
 DERIVATIVES_PATH=/shared/derivatives/
 FITS_PATH=/fits/fits-1.3.0/fits.sh
 # fits_version should appear exactly like this, including fits-
@@ -94,3 +98,5 @@ LDAP_SSL=false
 
 SMTP_HOST=
 SMTP_PORT=
+
+MDR_HOST=

.gitignore

@@ -349,3 +349,5 @@ $RECYCLE.BIN/
 # Environment variables file
 .env.production
 .env
+/hyrax/.fedora-test.pid
+/hyrax/.solr-test.pid

README.md

@@ -221,3 +221,9 @@ There is [docker documentation](https://docs.docker.com/storage/volumes/#backup-
 * As mentioned above, there is a `.env` file containing application secrets. This **must not** be checked into version control!
 * The system is configured on start-up using the `docker-entrypoint.sh` script, which configures users in the `seed/setup.json` file.
 * Importers are run manually in the container using the rails console. See [The project wiki](https://github.com/antleaf/nims-hyrax/wiki) for more information.
+
+## Code Status
+
+[![Codeship Status for antleaf/nims-hyrax](https://app.codeship.com/projects/d4cc8560-e430-0136-fffd-6a7889452552/status?branch=develop)](https://app.codeship.com/projects/319029)
+
+[![Coverage Status](https://coveralls.io/repos/github/antleaf/nims-hyrax/badge.svg?branch=develop)](https://coveralls.io/github/antleaf/nims-hyrax?branch=develop)

docker-compose.override.yml

@@ -32,7 +32,7 @@ services:
       - file_uploads:${UPLOADS_PATH}
       - derivatives:${DERIVATIVES_PATH}
       - cache:${CACHE_PATH}
-      - /srv/ngdr/data/:/data/data
+      - ${HOST_APP_DATA_PATH:-/srv/ngdr/data/}:/data/data
 
   web:
     ports:

docker-compose.yml

@@ -4,6 +4,7 @@ volumes:
   solr:
   db:
   db-fcrepo:
+  app:
 
 networks:
   internal:
@@ -90,6 +91,10 @@ services:
         AIRBRAKE_PROJECT_KEY: ${AIRBRAKE_PROJECT_KEY}
     env_file:
       - .env
+    volumes:
+      - app:${UPLOADS_PATH}
+      - app:${DERIVATIVES_PATH}
+      - app:${CACHE_PATH}
     networks:
       internal:
 

hyrax/Gemfile

@@ -51,7 +51,7 @@ end
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
-gem 'hyrax', '~> 2.4.1'
+gem 'hyrax', '~> 2.6'
 group :development, :test do
   gem 'solr_wrapper', '~> 2.0'
 end
@@ -81,4 +81,13 @@ end
 
 gem 'willow_sword', git: 'https://github.com/CottageLabs/willow_sword.git', :branch => 'feature/prep_for_new_release'
 
-gem 'simplecov', require: false, group: :test
+group :test do
+  gem 'simplecov', require: false
+  gem 'capybara'
+  gem 'launchy'
+  gem 'webdrivers', '~> 4.1'
+  gem 'cucumber-rails', :require => false
+  gem 'database_cleaner'
+end
+
+gem 'coveralls', require: false