From 26f8a6b16972667804b6cad72d2dd54d7be01978 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Fri, 18 Jan 2019 14:25:25 -0500 Subject: [PATCH] windows-x86: Fix saving tagged image --- .circleci/config.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 44dc56a..81c456b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -358,7 +358,7 @@ jobs: docker load -i ~/docker/base.tar make windows-x86 tagged=$(docker images -q -f 'since=dockcross/windows-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-x86) - docker save -o ~/docker/windows-x86.tar dockcross/windows-x86:latest + docker save -o ~/docker/windows-x86.tar dockcross/windows-x86:latest $tagged - run: name: windows-x86 test command: | @@ -580,11 +580,8 @@ jobs: command: | docker load -i ~/docker/windows-x86.tar if [ "${CIRCLE_BRANCH}" == "master" ]; then - set -x docker login -u $DOCKER_USER -p $DOCKER_PASS docker push dockcross/windows-x86:latest - docker images - docker images -q -f 'since=dockcross/windows-x86:latest' --format '{{.Repository}}:{{.Tag}}' tagged=$(docker images -q -f 'since=dockcross/windows-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-x86) docker push $tagged fi