eclipse-rdf4jGH-5064: experimental move to Tomcat 9 and Jetty 12

Signed-off-by: Bart Hanssens <bart.hanssens@bosa.fgov.be>
Fedict · Jul 25, 2024 · a8ec79b · a8ec79b
1 parent 975a0f6
commit a8ec79b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/docker/Dockerfile-jetty b/docker/Dockerfile-jetty
@@ -16,15 +16,14 @@ LABEL org.opencontainers.image.authors="Bart Hanssens (bart.hanssens@bosa.fgov.b
 
 USER root
 
-ENV JAVA_OPTIONS="-Dorg.eclipse.rdf4j.rio.jsonld_secure_mode=false"
+ENV JAVA_OPTIONS="-Dorg.eclipse.rdf4j.appdata.basedir=/var/rdf4j -Dorg.eclipse.rdf4j.rio.jsonld_secure_mode=false"
 ENV JETTY_MODULES="logging-jetty,requestlog"
 
 COPY --from=temp /tmp/eclipse-rdf4j*/war/*.war /var/lib/jetty/webapps/
 
 # mimic Tomcat directories for data and logs
 
 RUN	ln -s /usr/local/jetty/logs /var/lib/jetty/logs && \
-	ln -s /var/lib/.RDFJ /var/rdf4j && \
 	mkdir -p /usr/local/jetty/logs && \
 	chown -R jetty:jetty /usr/local/jetty/logs && \
 	chown -R jetty:jetty /var/rdf4j && \

diff --git a/docker/Dockerfile-tomcat b/docker/Dockerfile-tomcat
@@ -11,7 +11,7 @@ WORKDIR /tmp
 RUN unzip -q /tmp/rdf4j.zip
 
 # Final workbench
-FROM tomcat:10-jre17-temurin
+FROM tomcat:9-jre17-temurin
 MAINTAINER Bart Hanssens (bart.hanssens@bosa.fgov.be)
 
 RUN apt-get clean && apt-get update && apt-get upgrade -y && apt-get clean