Switch to the official base image RC

This commit is contained in:
pzurek
2023-06-29 09:18:58 +02:00
parent a99feae1e2
commit 32a35e273e
2 changed files with 2 additions and 8 deletions

View File

@@ -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
clone_and_install alfresco-aos-module

View File

@@ -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