Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit 6debff7

Browse files
committed
fix docker credentials sharing between Docker@2 and bash activities in build
1 parent 0ada6d8 commit 6debff7

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

build/azure-devops/multiarch.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ parameters:
66

77
jobs:
88
- job: manifest
9-
condition: and(succeeded(),ne('${{ variables['Build.Reason'] }}', 'PullRequest'))
10-
dependsOn:
11-
- BuildWindows
12-
- BuildLinux
9+
# condition: and(succeeded(),ne('${{ variables['Build.Reason'] }}', 'PullRequest'))
10+
# dependsOn:
11+
# - BuildWindows
12+
# - BuildLinux
1313
pool:
1414
vmImage: 'Ubuntu 16.04'
1515
steps:
@@ -21,7 +21,8 @@ jobs:
2121
dockerRegistryEndpoint: ${{ parameters.registryEndpoint }}
2222
- bash: |
2323
mkdir -p ~/.docker
24-
echo '{ "experimental": "enabled" }' > ~/.docker/config.json
24+
sed '$ s/.$//' $DOCKER_CONFIG/config.json > ~/.docker/config.json
25+
echo ',"experimental": "enabled" }' >> ~/.docker/config.json
2526
docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:${{ parameters.branch }} ${{ parameters.registry }}/${{ parameters.image }}:linux-${{ parameters.branch }} ${{ parameters.registry }}/${{ parameters.image }}:win-${{ parameters.branch }}
2627
docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:latest ${{ parameters.registry }}/${{ parameters.image }}:linux-latest ${{ parameters.registry }}/${{ parameters.image }}:win-latest
2728
docker --config ~/.docker manifest push ${{ parameters.registry }}/${{ parameters.image }}:${{ parameters.branch }}

0 commit comments

Comments
 (0)