Skip to content

Commit

Permalink
Remove base image override for Alpine (#789)
Browse files Browse the repository at this point in the history
  • Loading branch information
mthalman authored Feb 7, 2023
1 parent 8bd98ed commit efbcd10
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 15 deletions.
4 changes: 2 additions & 2 deletions eng/pipelines/dotnet-buildtools-prereqs-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ stages:
- template: ../../../pipelines/steps/set-base-image-override-options.yml
parameters:
variableName: customCopyBaseImagesArgs
dockerfileOs: (alpine|centos|debian|fedora|ubuntu)
dockerfileOs: (centos|debian|fedora|ubuntu)
baseOverrideRegistry: $(overrideRegistry) # Comes from DotNet-Docker-Common variable group
customBuildInitSteps:
- template: /eng/pipelines/steps/install-cross-build-prereqs.yml
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- template: ../../../pipelines/steps/set-base-image-override-options.yml
parameters:
variableName: imageBuilderBuildArgs
dockerfileOs: (alpine|centos|debian|fedora|ubuntu)
dockerfileOs: (centos|debian|fedora|ubuntu)
baseOverrideRegistry: $(overrideRegistry) # Comes from DotNet-Docker-Common variable group

13 changes: 0 additions & 13 deletions eng/pipelines/dotnet-buildtools-prereqs-alpine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,3 @@ stages:
parameters:
internalProjectName: ${{ variables.internalProjectName }}
publicProjectName: ${{ variables.publicProjectName }}
${{ if eq(variables['System.TeamProject'], 'internal') }}:
customCopyBaseImagesInitSteps:
- template: ../../../pipelines/steps/set-base-image-override-options.yml
parameters:
variableName: customCopyBaseImagesArgs
dockerfileOs: alpine
baseOverrideRegistry: $(overrideRegistry) # Comes from DotNet-Docker-Common variable group
customBuildInitSteps:
- template: ../../../pipelines/steps/set-base-image-override-options.yml
parameters:
variableName: imageBuilderBuildArgs
dockerfileOs: alpine
baseOverrideRegistry: $(overrideRegistry) # Comes from DotNet-Docker-Common variable group

0 comments on commit efbcd10

Please sign in to comment.