From a6a58dcd1e7f85a3644f37370f98ac7998baf9ed Mon Sep 17 00:00:00 2001
From: Anusha Ranganathan <anusha@cottagelabs.com>
Date: Thu, 12 Oct 2023 20:28:02 +0200
Subject: [PATCH] Upgrade fedora image in docker
---
.env.template | 4 +---
.env.template.development | 4 +---
docker-compose.yml | 2 +-
hyrax/config/fedora.yml | 4 ++--
hyrax/docker-entrypoint.sh | 2 +-
5 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/.env.template b/.env.template
index 4153d713..cce84f7d 100644
--- a/.env.template
+++ b/.env.template
@@ -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
diff --git a/.env.template.development b/.env.template.development
index 15e69944..1e645451 100644
--- a/.env.template.development
+++ b/.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
diff --git a/docker-compose.yml b/docker-compose.yml
index f2cd4ddc..b76f4cbe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@ networks:
services:
fcrepo:
- image: ualbertalib/docker-fcrepo4:4.7
+ image: ghcr.io/samvera/fcrepo4:4.7.5
restart: unless-stopped
expose:
- 8080
diff --git a/hyrax/config/fedora.yml b/hyrax/config/fedora.yml
index 41b2f271..53d886bc 100644
--- a/hyrax/config/fedora.yml
+++ b/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
diff --git a/hyrax/docker-entrypoint.sh b/hyrax/docker-entrypoint.sh
index cfd73e20..1383c53a 100644
--- a/hyrax/docker-entrypoint.sh
+++ b/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
--
GitLab