From 60415a8eb92bdd0cb60adb2feca000e7cc307fec Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Tue, 18 Jun 2019 17:33:17 +0200 Subject: [PATCH] also push build deps images when building final images for Disco images, otherwise never pushed --- .ci/travis/docker_image/before_script.sh | 3 +++ .ci/travis/linux/before_script.sh | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.ci/travis/docker_image/before_script.sh b/.ci/travis/docker_image/before_script.sh index 2c50e38e74e..811844baa78 100755 --- a/.ci/travis/docker_image/before_script.sh +++ b/.ci/travis/docker_image/before_script.sh @@ -29,6 +29,9 @@ docker --version docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "qgis/qgis3-build-deps:${DOCKER_TAG}" -f ${DOCKER_BUILD_DEPS_FILE} . +echo "push to qgis/qgis3-build-deps:${DOCKER_TAG}" +docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" +docker push "qgis/qgis3-build-deps:${DOCKER_TAG}" echo "travis_fold:end:docker_build" diff --git a/.ci/travis/linux/before_script.sh b/.ci/travis/linux/before_script.sh index 8127729ed7d..96a3e6ca441 100755 --- a/.ci/travis/linux/before_script.sh +++ b/.ci/travis/linux/before_script.sh @@ -38,7 +38,6 @@ echo "${bold}Docker push deps${endbold}" if [[ $DOCKER_DEPS_PUSH =~ true ]]; then echo "push to qgis/qgis3-build-deps:${DOCKER_TAG}" docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" - #docker tag "qgis/qgis3-build-deps:${DOCKER_TAG}" "qgis/qgis3-build-deps:latest" docker push "qgis/qgis3-build-deps:${DOCKER_TAG}" fi echo "travis_fold:end:docker_push"