Browse Source

disable windows containers in buildimages and multiarch yaml

pull/1287/head
ericuss 4 years ago
parent
commit
717041231c
2 changed files with 16 additions and 10 deletions
  1. +5
    -4
      build/azure-devops/buildimages.yaml
  2. +11
    -6
      build/azure-devops/multiarch.yaml

+ 5
- 4
build/azure-devops/buildimages.yaml View File

@ -13,7 +13,7 @@ jobs:
- bash: docker-compose -f src/docker-compose.yml build ${{ parameters.services }} - bash: docker-compose -f src/docker-compose.yml build ${{ parameters.services }}
displayName: Compose build ${{ parameters.services }} displayName: Compose build ${{ parameters.services }}
env: env:
TAG: ${{ variables['Build.SourceBranchName'] }}
TAG: pr-test-${{ variables['Build.SourceBranchName'] }}
- job: BuildContainersForPR_Windows - job: BuildContainersForPR_Windows
condition: False condition: False
# condition: eq('${{ variables['Build.Reason'] }}', 'PullRequest') # condition: eq('${{ variables['Build.Reason'] }}', 'PullRequest')
@ -27,7 +27,8 @@ jobs:
PLATFORM: win PLATFORM: win
NODE_IMAGE: stefanscherer/node-windows:10 NODE_IMAGE: stefanscherer/node-windows:10
- job: BuildLinux - job: BuildLinux
condition: ne('${{ variables['Build.Reason'] }}', 'PullRequest')
condition: true
# condition: ne('${{ variables['Build.Reason'] }}', 'PullRequest')
pool: pool:
vmImage: 'ubuntu-16.04' vmImage: 'ubuntu-16.04'
steps: steps:
@ -41,7 +42,7 @@ jobs:
qualifyImageNames: true qualifyImageNames: true
projectName: "" projectName: ""
dockerComposeFileArgs: | dockerComposeFileArgs: |
TAG=${{ variables['Build.SourceBranchName'] }}
TAG=pr-test-${{ variables['Build.SourceBranchName'] }}
- task: DockerCompose@0 - task: DockerCompose@0
displayName: Compose push ${{ parameters.images }} displayName: Compose push ${{ parameters.images }}
inputs: inputs:
@ -52,7 +53,7 @@ jobs:
qualifyImageNames: true qualifyImageNames: true
projectName: "" projectName: ""
dockerComposeFileArgs: | dockerComposeFileArgs: |
TAG=${{ variables['Build.SourceBranchName'] }}
TAG=pr-test-${{ variables['Build.SourceBranchName'] }}
- task: CopyFiles@2 - task: CopyFiles@2
inputs: inputs:
sourceFolder: ${{ parameters.helmfrom }} sourceFolder: ${{ parameters.helmfrom }}


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

@ -6,9 +6,10 @@ parameters:
jobs: jobs:
- job: manifest - job: manifest
condition: and(succeeded(),ne('${{ variables['Build.Reason'] }}', 'PullRequest'))
condition: true
# condition: and(succeeded(),ne('${{ variables['Build.Reason'] }}', 'PullRequest'))
dependsOn: dependsOn:
- BuildWindows
# - BuildWindows
- BuildLinux - BuildLinux
pool: pool:
vmImage: 'Ubuntu 16.04' vmImage: 'Ubuntu 16.04'
@ -19,12 +20,16 @@ jobs:
command: login command: login
containerregistrytype: 'Container Registry' containerregistrytype: 'Container Registry'
dockerRegistryEndpoint: ${{ parameters.registryEndpoint }} dockerRegistryEndpoint: ${{ parameters.registryEndpoint }}
# Disabled windows deploy
# 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 }}
# docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:latest ${{ parameters.registry }}/${{ parameters.image }}:linux-latest ${{ parameters.registry }}/${{ parameters.image }}:win-latest
- bash: | - bash: |
mkdir -p ~/.docker mkdir -p ~/.docker
sed '$ s/.$//' $DOCKER_CONFIG/config.json > ~/.docker/config.json sed '$ s/.$//' $DOCKER_CONFIG/config.json > ~/.docker/config.json
echo ',"experimental": "enabled" }' >> ~/.docker/config.json echo ',"experimental": "enabled" }' >> ~/.docker/config.json
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 }}
docker --config ~/.docker manifest create ${{ parameters.registry }}/${{ parameters.image }}:latest ${{ parameters.registry }}/${{ parameters.image }}:linux-latest ${{ parameters.registry }}/${{ parameters.image }}:win-latest
docker --config ~/.docker manifest push ${{ parameters.registry }}/${{ parameters.image }}:${{ parameters.branch }}
docker --config ~/.docker manifest push ${{ parameters.registry }}/${{ parameters.image }}:latest
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
displayName: Create multiarch manifest displayName: Create multiarch manifest

Loading…
Cancel
Save