Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-23 00:54:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

windows-x86: Fix saving tagged image

Browse Source
This commit is contained in:
Matt McCormick 2019-01-18 14:25:25 -05:00
parent eea86990ba
commit 26f8a6b169
No known key found for this signature in database
GPG Key ID: 45DA982347954FA5
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.circleci/config.yml
View File

@ -358,7 +358,7 @@ jobs:
docker load -i ~/docker/base.tar docker load -i ~/docker/base.tar
make windows-x86 make windows-x86
tagged=$(docker images -q -f 'since=dockcross/windows-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep 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: - run:
name: windows-x86 test name: windows-x86 test
command: | command: |
@ -580,11 +580,8 @@ jobs:
command: | command: |
docker load -i ~/docker/windows-x86.tar docker load -i ~/docker/windows-x86.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then if [ "${CIRCLE_BRANCH}" == "master" ]; then
set -x
docker login -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
docker push dockcross/windows-x86:latest 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) tagged=$(docker images -q -f 'since=dockcross/windows-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep windows-x86)
docker push $tagged docker push $tagged
fi fi