Skip to content
Snippets Groups Projects
Verified Commit dafbb4cd authored by Pascal Ernster's avatar Pascal Ernster :mask:
Browse files

Switch to custom fcrepo container image

This uses:
- the latest release 4.7.6 from fcrepo's 4.7 version branch
- the latest Tomcat 9 release that still supports Java 8

The previous image "ghcr.io/samvera/fcrepo4:4.7.5" has never actually
worked, so this new image restores compatibility with the original
"ualbertalib/docker-fcrepo4:4.7" image.

Also remove unneeded variables from .env.template and
.env.template.development.

Fixes: a6a58dcd "Upgrade fedora image in docker"
Fixes: #19
Fixes: https://gitlab.ruhr-uni-bochum.de/FDM/rdm-system/antleaf-projectmanagement/-/issues/216
parent 65af65ea
Branches feature/fcrepo-4.7.6
No related tags found
2 merge requests!290Switch to custom fcrepo container image,!289docker-compose.yml: Implement network isolation between containers
Pipeline #13460 failed
......@@ -31,8 +31,7 @@ REDIS_PORT=6379
FEDORA_URL_SCHEME=http
FEDORA_HOST=fcrepo
FEDORA_PORT=8080
FCREPO_PATH=/rest
FCREPO_VERSION=4.7.5
FCREPO_PATH=/fcrepo/rest
FCREPO_DEVELOPMENT_PORT=8080
FEDORA_TEST_PORT=8080
......@@ -180,4 +179,4 @@ CRCDATASET_AWARD_TITLE=
CRCDATASET_AWARD_URI=
CRCDATASET_LANGUAGE=
CRCDATASET_RESOURCE_TYPE="Collection"
DATASET_PUBLISHER=
\ No newline at end of file
DATASET_PUBLISHER=
......@@ -26,8 +26,7 @@ REDIS_PORT=6379
FEDORA_URL_SCHEME=http
FEDORA_HOST=fcrepo
FEDORA_PORT=8080
FCREPO_PATH=/rest
FCREPO_VERSION=4.7.5
FCREPO_PATH=/fcrepo/rest
FCREPO_DEVELOPMENT_PORT=8080
FEDORA_TEST_PORT=8080
......@@ -176,4 +175,4 @@ CRCDATASET_AWARD_TITLE=
CRCDATASET_AWARD_URI=
CRCDATASET_LANGUAGE=
CRCDATASET_RESOURCE_TYPE="Collection"
DATASET_PUBLISHER=
\ No newline at end of file
DATASET_PUBLISHER=
......@@ -5,7 +5,8 @@ networks:
services:
fcrepo:
image: ghcr.io/samvera/fcrepo4:4.7.5
build:
context: fcrepo
restart: unless-stopped
expose:
- 8080
......
FROM tomcat:9-jre8
# Install all available package updates for the base image
RUN apt-get update && apt-get upgrade --yes
ARG FCREPO_VERSION="4.7.6"
# Configuration for Fedora: https://wiki.lyrasis.org/display/FEDORA475/Application+Configuration
# See also: https://wiki.lyrasis.org/display/FEDORA475/Fedora+4.7.5+Documentation
# Example:
# ENV CATALINA_OPTS="${JAVA_OPTS} -Dfcrepo.home=/data -Dfcrepo.modeshape.configuration=classpath:/config/file-simple/repository.json"
# Install fcrepo. Note: Use "COPY" instead of "ADD", because "ADD" would also extract fcrepo.war (which is a ZIP archive)
ADD https://github.com/fcrepo4/fcrepo4/releases/download/fcrepo-${FCREPO_VERSION}/fcrepo-webapp-${FCREPO_VERSION}.war ${CATALINA_HOME}/webapps/fcrepo.war
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment