diff --git a/.travis.yml b/.travis.yml index 683a26b255..faf4cf9027 100644 --- a/.travis.yml +++ b/.travis.yml @@ -235,7 +235,6 @@ jobs: # TODO enable job - name: "Push to Nexus" stage: release - if: false before_script: bash scripts/travis/verify_release_tag.sh script: travis_wait 40 bash scripts/travis/maven_release.sh diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml index 986441232a..5fc126ea2b 100644 --- a/packaging/docker-alfresco/pom.xml +++ b/packaging/docker-alfresco/pom.xml @@ -189,15 +189,16 @@ - - ${image.name}:${image.tag} - - ${project.basedir}/ - - true - - - + + + + + + + + + + @@ -237,15 +238,16 @@ - - ${image.name}:${project.version} - - ${project.basedir}/ - - true - - - + + + + + + + + + + diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh index 3c5143bf19..e188b7bd8e 100644 --- a/scripts/travis/build.sh +++ b/scripts/travis/build.sh @@ -4,9 +4,11 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../../" source "$(dirname "${BASH_SOURCE[0]}")/build_functions.sh" -if [ "${TRAVIS_BUILD_STAGE_NAME,,}" = "release" ] && [ "${TRAVIS_BRANCH}" = "master" ] && isBranchBuild ; then +if isBranchBuild && [ "${TRAVIS_BRANCH}" = "master" ] && [ "${TRAVIS_BUILD_STAGE_NAME,,}" = "release" ] ; then + # update ":latest" image tags on remote repositories by using the maven *internal* profile PROFILES="-Pinternal" else + # build the ":latest" image tags locally with the maven *communityDocker* profile PROFILES="-PcommunityDocker" fi diff --git a/scripts/travis/build_functions.sh b/scripts/travis/build_functions.sh index f37febfe6b..305d60da3c 100644 --- a/scripts/travis/build_functions.sh +++ b/scripts/travis/build_functions.sh @@ -111,3 +111,18 @@ function pullAndBuildSameBranchOnUpstream() { popd } +function retieveLatestTag() { + local REPO="${1}" + local BRANCH="${2}" + + local LOCAL_PATH="/tmp/$(basename "${REPO%.git}")" + + git clone -q -b "${BRANCH}" "https://${GIT_USERNAME}:${GIT_PASSWORD}@${REPO}" "${LOCAL_PATH}" + + pushd "${LOCAL_PATH}" >/dev/null + git describe --abbrev=0 --tags + popd >/dev/null + + rm -rf "${LOCAL_PATH}" +} + diff --git a/scripts/travis/init.sh b/scripts/travis/init.sh index d6dd516c28..0e98f20826 100644 --- a/scripts/travis/init.sh +++ b/scripts/travis/init.sh @@ -7,6 +7,8 @@ mkdir -p "${HOME}/.m2" && cp -f .travis.settings.xml "${HOME}/.m2/settings.xml" find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf # Docker Logins +# todo enable when the dockerhub credentials are set on the project +#echo "${DOCKERHUB_USERNAME}" | docker login -u="${DOCKERHUB_PASSWORD}" --password-stdin echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io # Enable experimental docker features (for the image squash option)