From 32a35e273e1b1031f3cb825c88875dfd7aa89d35 Mon Sep 17 00:00:00 2001 From: pzurek Date: Thu, 29 Jun 2023 09:18:58 +0200 Subject: [PATCH] Switch to the official base image RC --- jakarta-dependencies/build-dependencies.sh | 8 +------- packaging/docker-alfresco/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/jakarta-dependencies/build-dependencies.sh b/jakarta-dependencies/build-dependencies.sh index 9a00c93dfd..b38ab913be 100755 --- a/jakarta-dependencies/build-dependencies.sh +++ b/jakarta-dependencies/build-dependencies.sh @@ -28,10 +28,4 @@ clone_and_install alfresco-office-services #Ugly hack to deal with AOS<->REPO circular dependencies mvn -f $DEPENDENCIES_DIR/.. install -pl :alfresco-remote-api -am -DskipTests -Dmaven.javadoc.skip=true -clone_and_install alfresco-aos-module - -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 +clone_and_install alfresco-aos-module \ No newline at end of file diff --git a/packaging/docker-alfresco/Dockerfile b/packaging/docker-alfresco/Dockerfile index 992368929f..d2bebd7fc6 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 tomcat10-jakarta:latest +FROM quay.io/alfresco/alfresco-base-tomcat:tomcat10-jre17-rockylinux8-release-candidate # Set default docker_context. ARG resource_path=target