diff --git a/CODEOWNERS b/CODEOWNERS index 7ed278348..2be4e4c6f 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -23,7 +23,6 @@ src/azurelinux/**/opt/ @dotnet/runtime-infrastructure @dotnet/dotnet-docker-revi src/cbl-mariner/**/android/ @dotnet/runtime-infrastructure @dotnet/dotnet-docker-reviewers src/cbl-mariner/**/fpm/ @dotnet/runtime-infrastructure @dotnet/dotnet-docker-reviewers src/cbl-mariner/**/opt/ @dotnet/runtime-infrastructure @dotnet/dotnet-docker-reviewers -src/cbl-mariner/**/docker-testrunner/ @dotnet/dotnet-docker-reviewers src/cbl-mariner/2.0/amd64/ @dotnet/runtime-infrastructure @dotnet/dotnet-docker-reviewers # centos diff --git a/src/cbl-mariner/2.0/docker-testrunner/Dockerfile b/src/cbl-mariner/2.0/docker-testrunner/Dockerfile deleted file mode 100644 index 17bd331bf..000000000 --- a/src/cbl-mariner/2.0/docker-testrunner/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -# Dockerfile used to create a testrunner image that can perform Docker operations. -# Usage: docker run --rm -v /var/run/docker.sock:/var/run/docker.sock testrunner pwsh -File xyz.ps1 - -FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 - -RUN tdnf install -y \ - ca-certificates \ - # Install Docker - moby-engine \ - moby-buildx \ - moby-cli \ - # Test dependencies - azure-cli \ - git \ - powershell \ - && tdnf clean all diff --git a/src/cbl-mariner/manifest.json b/src/cbl-mariner/manifest.json index 734a9f667..e6f49a10b 100644 --- a/src/cbl-mariner/manifest.json +++ b/src/cbl-mariner/manifest.json @@ -3,31 +3,6 @@ { "name": "dotnet-buildtools/prereqs", "images": [ - { - "sharedTags": { - "cbl-mariner2.0-docker-testrunner": {} - }, - "platforms": [ - { - "dockerfile": "src/cbl-mariner/2.0/docker-testrunner", - "os": "linux", - "osVersion": "cbl-mariner2.0", - "tags": { - "cbl-mariner2.0-docker-testrunner-amd64": {} - } - }, - { - "architecture": "arm64", - "dockerfile": "src/cbl-mariner/2.0/docker-testrunner", - "os": "linux", - "osVersion": "cbl-mariner2.0", - "tags": { - "cbl-mariner2.0-docker-testrunner-arm64v8": {} - }, - "variant": "v8" - } - ] - }, { "platforms": [ {