Merge branch 'fix/revert-fcrepo-to-ualberta-image' into 'develop'

Revert fcrepo to ualberta image

See merge request !295

.env.template

@@ -31,7 +31,7 @@ REDIS_PORT=6379
 FEDORA_URL_SCHEME=http
 FEDORA_HOST=fcrepo
 FEDORA_PORT=8080
-FCREPO_PATH=/rest
+FCREPO_PATH=/fcrepo/rest
 FCREPO_VERSION=4.7.5
 FCREPO_DEVELOPMENT_PORT=8080
 FEDORA_TEST_PORT=8080
@@ -180,4 +180,4 @@ CRCDATASET_AWARD_TITLE=
 CRCDATASET_AWARD_URI=
 CRCDATASET_LANGUAGE=
 CRCDATASET_RESOURCE_TYPE="Collection"
-DATASET_PUBLISHER=
\ No newline at end of file
+DATASET_PUBLISHER=

.env.template.development

@@ -26,7 +26,7 @@ REDIS_PORT=6379
 FEDORA_URL_SCHEME=http
 FEDORA_HOST=fcrepo
 FEDORA_PORT=8080
-FCREPO_PATH=/rest
+FCREPO_PATH=/fcrepo/rest
 FCREPO_VERSION=4.7.5
 FCREPO_DEVELOPMENT_PORT=8080
 FEDORA_TEST_PORT=8080
@@ -176,4 +176,4 @@ CRCDATASET_AWARD_TITLE=
 CRCDATASET_AWARD_URI=
 CRCDATASET_LANGUAGE=
 CRCDATASET_RESOURCE_TYPE="Collection"
-DATASET_PUBLISHER=
\ No newline at end of file
+DATASET_PUBLISHER=

docker-compose.yml

@@ -5,7 +5,7 @@ networks:
 
 services:
   fcrepo:
-    image: ghcr.io/samvera/fcrepo4:4.7.5
+    image: ualbertalib/docker-fcrepo4:4.7
     restart: unless-stopped
     expose:
       - 8080

hyrax/config/fedora.yml

 development:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: <%= ENV['FEDORA_URL_SCHEME'] || 'http' %>://<%= ENV['FEDORA_HOST'] || 'localhost' %>:<%= ENV['FCREPO_DEVELOPMENT_PORT'] || 8984 %><%= ENV['FCREPO_PATH'] || '/rest' %>
+  url: <%= ENV['FEDORA_URL_SCHEME'] || 'http' %>://<%= ENV['FEDORA_HOST'] || 'localhost' %>:<%= ENV['FCREPO_DEVELOPMENT_PORT'] || 8984 %><%= ENV['FCREPO_PATH'] || '/fcrepo/rest' %>
   base_path: /dev
 test:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: <%= ENV['FEDORA_URL_SCHEME'] || 'http' %>://<%= ENV['FEDORA_HOST'] || 'localhost' %>:<%= ENV['FEDORA_TEST_PORT'] || 8986 %><%= ENV['FCREPO_PATH'] || '/rest' %>
+  url: <%= ENV['FEDORA_URL_SCHEME'] || 'http' %>://<%= ENV['FEDORA_HOST'] || 'localhost' %>:<%= ENV['FEDORA_TEST_PORT'] || 8986 %><%= ENV['FCREPO_PATH'] || '/fcrepo/rest' %>
   base_path: /test
 production:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: <%= ENV['FEDORA_URL_SCHEME'] || 'http' %>://<%= ENV['FEDORA_HOST'] || 'fcrepo' %>:<%= ENV['FEDORA_PORT'] || '8080' %><%= ENV['FCREPO_PATH'] || '/rest' %>
+  url: <%= ENV['FEDORA_URL_SCHEME'] || 'http' %>://<%= ENV['FEDORA_HOST'] || 'fcrepo' %>:<%= ENV['FEDORA_PORT'] || '8080' %><%= ENV['FCREPO_PATH'] || '/fcrepo/rest' %>
   base_path: /hyrax_production