Skip to content

Commit c8f44ba

Browse files
authored
Remove support for ubuntu-18.04 (#22795)
1 parent cbb9634 commit c8f44ba

File tree

3 files changed

+4
-63
lines changed

3 files changed

+4
-63
lines changed

docker/Dockerfile-ubuntu-18.04

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

tools/Docker/BuildImages.ps1

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,10 @@ try {
2828
foreach ($dockerfile in (Get-ChildItem -Path $DOCKER -Filter "Dockerfile-*").FullName) {
2929
$os = $dockerfile.split("Dockerfile-")[1]
3030
Write-Output $os
31-
if ($os -eq "ubuntu-18.04") {
32-
docker build --build-arg VERSION=$version `
33-
--build-arg BUILD_DATE=$date `
34-
--tag $DockerImageName':'$version"-"$os `
35-
--tag $DockerImageName':latest' `
36-
-f $dockerfile $DOCKER
37-
}else {
38-
docker build --build-arg VERSION=$version `
39-
--build-arg BUILD_DATE=$date `
40-
--tag $DockerImageName':'$version"-"$os `
41-
-f $dockerfile $DOCKER
42-
}
31+
docker build --build-arg VERSION=$version `
32+
--build-arg BUILD_DATE=$date `
33+
--tag $DockerImageName':'$version"-"$os `
34+
-f $dockerfile $DOCKER
4335

4436
}
4537
} catch {

tools/Test/SmokeTest/PrepareRequiredPowershell.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ function Install-PowerShell {
7575
}
7676

7777
# Image "macOS-10.15" preinstalled Az modules
78-
# Image "vs2017-win2016" and "ubuntu-18.04" preinstalled AzureRM modules.
7978

8079
# Remove Az.* modules
8180
. "$PSScriptRoot/Common.ps1"

0 commit comments

Comments
 (0)