From efbcd1079edef4698ada1676a5e33c4c9672f85a Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 7 Feb 2023 14:53:51 -0600 Subject: [PATCH] Remove base image override for Alpine (#789) --- eng/pipelines/dotnet-buildtools-prereqs-all.yml | 4 ++-- eng/pipelines/dotnet-buildtools-prereqs-alpine.yml | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/eng/pipelines/dotnet-buildtools-prereqs-all.yml b/eng/pipelines/dotnet-buildtools-prereqs-all.yml index e9f11d3f0..a262b241a 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-all.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-all.yml @@ -26,7 +26,7 @@ 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 @@ -34,6 +34,6 @@ stages: - 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 diff --git a/eng/pipelines/dotnet-buildtools-prereqs-alpine.yml b/eng/pipelines/dotnet-buildtools-prereqs-alpine.yml index 734d74cb5..ee2aaa736 100644 --- a/eng/pipelines/dotnet-buildtools-prereqs-alpine.yml +++ b/eng/pipelines/dotnet-buildtools-prereqs-alpine.yml @@ -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