diff --git a/.travis.yml b/.travis.yml index cb9d729014..57863e20e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -550,6 +550,7 @@ jobs: - echo "GIT Describe:" && git describe - echo "packaging/version:" && cat packaging/version - packaging/docker/check_login.sh + - echo "Switching to latest master branch, to pick up tagging if any" && git checkout master && git pull - packaging/docker/build.sh - packaging/docker/publish.sh after_failure: post_message "TRAVIS_MESSAGE" "<!here> Docker image publishing failed" diff --git a/packaging/docker/publish.sh b/packaging/docker/publish.sh index fd1883afb7..5a9e67edeb 100755 --- a/packaging/docker/publish.sh +++ b/packaging/docker/publish.sh @@ -39,10 +39,6 @@ if [ ! -z ${DEVEL+x} ]; then declare -a ARCHS=(${DEVEL_ARCHS[@]}) fi -echo "Syncing repository with latest changes (We may have updated with package versions)" -git checkout master -git pull - # Ensure there is a version, the most appropriate one if [ "${VERSION}" == "" ]; then VERSION=$(git tag --points-at)