Browse Source

disabled dlopy in windows and prefixes

pull/1287/head
ericuss 4 years ago
parent
commit
3ee8ceb1a1
2 changed files with 6 additions and 8 deletions
  1. +1
    -2
      build/azure-devops/buildimages.yaml
  2. +5
    -6
      build/azure-devops/multiarch.yaml

+ 1
- 2
build/azure-devops/buildimages.yaml View File

@ -27,8 +27,7 @@ jobs:
PLATFORM: win
NODE_IMAGE: stefanscherer/node-windows:10
- job: BuildLinux
condition: true
# condition: ne('${{ variables['Build.Reason'] }}', 'PullRequest')
condition: ne('${{ variables['Build.Reason'] }}', 'PullRequest')
pool:
vmImage: 'ubuntu-16.04'
steps:


+ 5
- 6
build/azure-devops/multiarch.yaml View File

@ -6,8 +6,7 @@ parameters:
jobs:
- job: manifest
condition: true
# condition: and(succeeded(),ne('${{ variables['Build.Reason'] }}', 'PullRequest'))
condition: and(succeeded(),ne('${{ variables['Build.Reason'] }}', 'PullRequest'))
dependsOn:
# - BuildWindows
- BuildLinux
@ -27,8 +26,8 @@ jobs:
mkdir -p ~/.docker
sed '$ s/.$//' $DOCKER_CONFIG/config.json > ~/.docker/config.json
echo ',"experimental": "enabled" }' >> ~/.docker/config.json
docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:pr-test-${{ parameters.branch }} ${{ parameters.registry }}/${{ parameters.image }}:pr-test-linux-${{ parameters.branch }}
docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:pr-test-latest ${{ parameters.registry }}/${{ parameters.image }}:pr-test-linux-latest
docker --config ~/.docker manifest push ${{ parameters.registry }}/${{ parameters.image }}:pr-test-${{ parameters.branch }}
docker --config ~/.docker manifest push ${{ parameters.registry }}/${{ parameters.image }}:pr-test-latest
docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:{{ parameters.branch }} ${{ parameters.registry }}/${{ parameters.image }}:linux-${{ parameters.branch }}
docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:latest ${{ parameters.registry }}/${{ parameters.image }}:linux-latest
docker --config ~/.docker manifest push ${{ parameters.registry }}/${{ parameters.image }}:${{ parameters.branch }}
docker --config ~/.docker manifest push ${{ parameters.registry }}/${{ parameters.image }}:latest
displayName: Create multiarch manifest

Loading…
Cancel
Save