Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 2d0f7a2

Browse files
authored
Merge pull request #13826 from dotnet/dev/marcpop/removedocker3.1.4xx
Remove the 8 dockerfiles flagged by compliance
2 parents 49315b0 + e4239d5 commit 2d0f7a2

File tree

10 files changed

+2
-356
lines changed

10 files changed

+2
-356
lines changed

netci.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ ${buildCommand}
9393
}
9494
}
9595
else if (os == 'Ubuntu') {
96-
buildCommand = "${baseShellBuildCommand} --docker ubuntu.14.04"
96+
buildCommand = "${baseShellBuildCommand} --docker ubuntu.18.04"
9797
}
9898
else if (os == 'RHEL6') {
9999
osUsedForMachineAffinity = 'Ubuntu16.04';
100-
buildCommand = "${baseShellBuildCommand} --runtime-id rhel.6-x64 --docker rhel.6"
100+
buildCommand = "${baseShellBuildCommand} --runtime-id rhel.6-x64 --docker rhel"
101101
}
102102
else if (os == 'ubuntu.18.04' || os == 'fedora.27' || os == 'opensuse.42.3') {
103103
osUsedForMachineAffinity = 'Ubuntu16.04'

scripts/docker/fedora.23/Dockerfile

Lines changed: 0 additions & 30 deletions
This file was deleted.

scripts/docker/fedora.24/Dockerfile

Lines changed: 0 additions & 28 deletions
This file was deleted.

scripts/docker/opensuse.13.2/Dockerfile

Lines changed: 0 additions & 25 deletions
This file was deleted.

scripts/docker/opensuse.42.1/Dockerfile

Lines changed: 0 additions & 50 deletions
This file was deleted.

scripts/docker/rhel.6/Dockerfile

Lines changed: 0 additions & 31 deletions
This file was deleted.

scripts/docker/ubuntu.14.04/Dockerfile

Lines changed: 0 additions & 63 deletions
This file was deleted.

scripts/docker/ubuntu.16.04/Dockerfile

Lines changed: 0 additions & 56 deletions
This file was deleted.

scripts/docker/ubuntu.16.10/Dockerfile

Lines changed: 0 additions & 63 deletions
This file was deleted.

scripts/dockerrun.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,8 @@ if [ -z "$DOCKERFILE" ]; then
7575
export DOCKERFILE=scripts/docker/debian
7676
elif [ "$(cat /etc/*-release | grep -cim1 fedora)" -eq 1 ]; then
7777
echo "Detected current OS as Fedora, determining fedora version to use..."
78-
if [ "$(cat /etc/*-release | grep -cim1 23)" -eq 1 ]; then
79-
echo "using 'fedora.23' image"
80-
export DOCKERFILE=scripts/docker/fedora.23
81-
fi
8278
elif [ "$(cat /etc/*-release | grep -cim1 opensuse)" -eq 1 ]; then
8379
echo "Detected current OS as openSUSE, determining openSUSE version to use..."
84-
if [ "$(cat /etc/*-release | grep -cim1 13.2)" -eq 1 ]; then
85-
echo "using 'openSUSE.13.2' image"
86-
export DOCKERFILE=scripts/docker/opensuse.13.2
87-
fi
8880
else
8981
echo "Unknown Linux Distro. Using 'ubuntu' image"
9082
export DOCKERFILE=scripts/docker/ubuntu

0 commit comments

Comments
 (0)