diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index e74e8e36c1..8428f85532 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -156,7 +156,7 @@ build-image - install + package build @@ -214,54 +214,5 @@ - - - releaseImage - - - - - io.fabric8 - fabric8-maven-plugin - - - - - ${image.name}:${project.version} - ${image.registry} - - ${project.basedir}/ - - true - - - - - - ${image.name}:${project.version} - - ${project.basedir}/ - - true - - - - - - - - build-push-image - deploy - - build - - - - - - - - - diff --git a/scripts/travis/build_functions.sh b/scripts/travis/build_functions.sh index 220bdfbed0..513846a7a4 100644 --- a/scripts/travis/build_functions.sh +++ b/scripts/travis/build_functions.sh @@ -94,6 +94,22 @@ function pullUpstreamTag() { cloneRepo "${UPSTREAM_REPO}" "${TAG}" } +function pullUpstreamTagAndBuildDockerImage() { + local UPSTREAM_REPO="${1}" + local TAG="${2}" + local EXTRA_BUILD_ARGUMENTS="${3}" + + cloneRepo "${UPSTREAM_REPO}" "${TAG}" + + pushd "$(dirname "${BASH_SOURCE[0]}")/../../../" + + cd "$(basename "${UPSTREAM_REPO%.git}")" + + mvn -B -V clean package -DskipTests -Dmaven.javadoc.skip=true "-Dimage.tag=${TAG}" ${EXTRA_BUILD_ARGUMENTS} + + popd +} + function pullAndBuildSameBranchOnUpstream() { local UPSTREAM_REPO="${1}" local EXTRA_BUILD_ARGUMENTS="${2}"