diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index 25db9ee222..aca85ccb4f 100644 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -136,7 +136,8 @@ mvn dependency:copy -Dartifact=com.microsoft.sqlserver:mssql-jdbc:${MSSQL_JDBC_T ORACLE_JDBC_TAG=$(mvn help:evaluate -Dexpression=dependency.ojdbc.version -q -DforceStdout) mvn dependency:copy -Dartifact=com.oracle.database.jdbc:ojdbc11:${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/