Merge branch 'feature/216-update-fedora' into 'develop'

Upgrade fedora image in docker

Closes antleaf-projectmanagement#216

See merge request FDM/rdm-system/rdms!230

.env.template

@@ -31,9 +31,7 @@ REDIS_PORT=6379
 FEDORA_URL_SCHEME=http
 FEDORA_HOST=fcrepo
 FEDORA_PORT=8080
-# FCREPO_ENDPOINT=hyrax_production # Optional - default is production
-# FCREPO_PATH is Optional - default is /fcrepo/rest
-FCREPO_PATH=/fcrepo/rest
+FCREPO_PATH=/rest
 FCREPO_VERSION=4.7.5
 FCREPO_DEVELOPMENT_PORT=8080
 FEDORA_TEST_PORT=8080

.env.template.development

@@ -26,9 +26,7 @@ REDIS_PORT=6379
 FEDORA_URL_SCHEME=http
 FEDORA_HOST=fcrepo
 FEDORA_PORT=8080
-# FCREPO_ENDPOINT=hyrax_production # Optional - default is production
-# FCREPO_PATH is Optional - default is /fcrepo/rest
-FCREPO_PATH=/fcrepo/rest
+FCREPO_PATH=/rest
 FCREPO_VERSION=4.7.5
 FCREPO_DEVELOPMENT_PORT=8080
 FEDORA_TEST_PORT=8080

docker-compose.yml

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

hyrax/config/fedora.yml

@@ -11,5 +11,5 @@ test:
 production:
   user: fedoraAdmin
   password: fedoraAdmin
-  url: <%= ENV['FEDORA_URL_SCHEME'] || 'http' %>://<%= ENV['FEDORA_HOST'] || 'fcrepo' %>:<%= ENV['FEDORA_PORT'] || '8080' %><%= ENV['FCREPO_PATH'] || '/fcrepo/rest' %>
-  base_path: /hyrax_production
\ No newline at end of file
+  url: <%= ENV['FEDORA_URL_SCHEME'] || 'http' %>://<%= ENV['FEDORA_HOST'] || 'fcrepo' %>:<%= ENV['FEDORA_PORT'] || '8080' %><%= ENV['FCREPO_PATH'] || '/rest' %>
+  base_path: /hyrax_production

hyrax/docker-entrypoint.sh

@@ -36,7 +36,7 @@ do
 
     # check Fedora is running
     if [ ${fedora_running} -eq 0 ] ; then
-      fedora_curl=$(curl --silent --connect-timeout 45 "http://${FEDORA_HOST:-fcrepo}:${FEDORA_PORT:-8080}/fcrepo/" | grep "Fedora Commons Repository")
+      fedora_curl=$(curl --silent --connect-timeout 45 "http://${FEDORA_HOST:-fcrepo}:${FEDORA_PORT:-8080}/" | grep "Fedora Commons Repository")
       if [ -n "${fedora_curl}" ] ; then
           echo "Fedora is running"
           fedora_running=1