From 0199a103508dcf1047f9f39c7d9e2b12808dd7d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=BBurek?= Date: Tue, 26 Nov 2024 10:45:54 +0100 Subject: [PATCH] ACS-9037 Use correct Repo latest image (#2997) (cherry picked from commit a25d7df87b4a4cc10647ba64d2e9458fff7dad5a) --- scripts/ci/build.sh | 3 ++- .../environment/alfresco-with-jdbc-drivers/alfresco.Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index c49d67f0e1..3d3005c78f 100644 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -133,7 +133,8 @@ mvn dependency:copy -Dartifact=com.microsoft.sqlserver:mssql-jdbc:${MSSQL_JDBC_T ORACLE_JDBC_TAG=$(mvn help:evaluate -Dexpression=dependency.ojdbc8.version -q -DforceStdout) mvn dependency:copy -Dartifact=com.oracle.database.jdbc:ojdbc8:${ORACLE_JDBC_TAG}:jar -DoutputDirectory=tests/environment/alfresco-with-jdbc-drivers -docker build -t alfresco-repository-databases:latest -f tests/environment/alfresco-with-jdbc-drivers/alfresco.Dockerfile . +REPO_LATEST_IMAGE=$(docker images --format='{{.Repository}}:{{.Tag}}' | grep "alfresco-content-repository:latest") +docker build -t alfresco-repository-databases:latest -f tests/environment/alfresco-with-jdbc-drivers/alfresco.Dockerfile . --build-arg BASE_IMAGE=${REPO_LATEST_IMAGE} source tests/environment/.env diff --git a/tests/environment/alfresco-with-jdbc-drivers/alfresco.Dockerfile b/tests/environment/alfresco-with-jdbc-drivers/alfresco.Dockerfile index 67f8c39db8..ac0806480b 100644 --- a/tests/environment/alfresco-with-jdbc-drivers/alfresco.Dockerfile +++ b/tests/environment/alfresco-with-jdbc-drivers/alfresco.Dockerfile @@ -1,4 +1,5 @@ #BUIDING CONTAINER FOR TAS TESTING WITH DIFFERENT JDBC CONNECTORS -FROM alfresco/alfresco-content-repository:latest +ARG BASE_IMAGE +FROM $BASE_IMAGE COPY tests/environment/alfresco-with-jdbc-drivers/*.jar /usr/local/tomcat/lib/