From 7c545a7066f1c71ca2761eafff391aee02271dd1 Mon Sep 17 00:00:00 2001 From: pzurek Date: Tue, 13 Jun 2023 15:19:19 +0200 Subject: [PATCH] Use tomcat 10.1 base image --- jakarta-dependencies/build-dependencies.sh | 8 +++++++- packaging/docker-alfresco/Dockerfile | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/jakarta-dependencies/build-dependencies.sh b/jakarta-dependencies/build-dependencies.sh index fce9e6f51b..1464637813 100755 --- a/jakarta-dependencies/build-dependencies.sh +++ b/jakarta-dependencies/build-dependencies.sh @@ -16,4 +16,10 @@ function clone_and_install { clone_and_install surf-webscripts clone_and_install alfresco-greenmail -clone_and_install alfresco-tas-email \ No newline at end of file +clone_and_install alfresco-tas-email + +tomcat_image_path=$DEPENDENCIES_DIR/projects/alfresco-docker-base-tomcat +if [ ! -d "$tomcat_image_path" ]; then + git clone --single-branch --branch jakarta-migration https://github.com/Alfresco/alfresco-docker-base-tomcat.git $tomcat_image_path +fi +docker build --build-arg JDIST=jre --build-arg DISTRIB_NAME=rockylinux --build-arg DISTRIB_MAJOR=8 --build-arg JAVA_MAJOR=17 --build-arg TOMCAT_MAJOR=10 -t tomcat10-jakarta $tomcat_image_path \ No newline at end of file diff --git a/packaging/docker-alfresco/Dockerfile b/packaging/docker-alfresco/Dockerfile index 7d774afefa..992368929f 100644 --- a/packaging/docker-alfresco/Dockerfile +++ b/packaging/docker-alfresco/Dockerfile @@ -1,6 +1,6 @@ # Fetch image based on Tomcat 9.0, Java 17 and Rocky Linux 8 # More infos about this image: https://github.com/Alfresco/alfresco-docker-base-tomcat -FROM alfresco/alfresco-base-tomcat:tomcat9-jre17-rockylinux8-202303081618 +FROM tomcat10-jakarta:latest # Set default docker_context. ARG resource_path=target