Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove .NET Monitor 6.0 Dockerfiles #3770

Merged
merged 2 commits into from
May 17, 2022
Merged

Remove .NET Monitor 6.0 Dockerfiles #3770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c9836f
Remove dotnet-monitor 6.0 image (#3742)
kelltrick Apr 28, 2022
bd474ed
Remove unused .NET Monitor 6.0 version variables (#3759)
jander-msft May 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion README.monitor.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ See the [documentation](https://go.microsoft.com/fwlink/?linkid=2158052) for how
Tags | Dockerfile | OS Version
-----------| -------------| -------------
6.1.1-alpine-amd64, 6.1-alpine-amd64, 6-alpine-amd64, 6.1.1-alpine, 6.1-alpine, 6-alpine, 6.1.1, 6.1, 6, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.1/alpine/amd64/Dockerfile) | Alpine 3.15
6.0.2-alpine-amd64, 6.0-alpine-amd64, 6.0.2-alpine, 6.0-alpine, 6.0.2, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.0/alpine/amd64/Dockerfile) | Alpine 3.15

##### .NET Monitor Preview Tags
Tags | Dockerfile | OS Version
Expand Down
1 change: 0 additions & 1 deletion eng/mcr-tags-metadata-templates/monitor-tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ $(McrTagsYmlTagGroup:7.0-alpine-amd64)
$(McrTagsYmlTagGroup:7.0-alpine-arm64v8)
customSubTableTitle: .NET Monitor Preview Tags
$(McrTagsYmlTagGroup:6.1-alpine-amd64)
$(McrTagsYmlTagGroup:6.0-alpine-amd64)
25 changes: 0 additions & 25 deletions manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6925,31 +6925,6 @@
"readmeTemplate": "eng/readme-templates/README.md",
"mcrTagsMetadataTemplate": "eng/mcr-tags-metadata-templates/monitor-tags.yml",
"images": [
{
"productVersion": "$(monitor|6.0|product-version)",
"sharedTags": {
"$(monitor|6.0|product-version)-alpine": {},
"6.0-alpine": {},
"$(monitor|6.0|product-version)": {},
"6.0": {}
},
"platforms": [
{
"buildArgs": {
"ASPNET_REPO": "$(Repo:aspnet)",
"SDK_REPO": "$(Repo:sdk)"
},
"dockerfile": "src/monitor/6.0/alpine/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile",
"os": "linux",
"osVersion": "alpine3.15",
"tags": {
"$(monitor|6.0|product-version)-alpine-amd64": {},
"6.0-alpine-amd64": {}
}
}
]
},
{
"productVersion": "$(monitor|6.1|product-version)",
"sharedTags": {
Expand Down
6 changes: 0 additions & 6 deletions manifest.versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@
"base-url|7.0|main": "$(base-url|public|main)",
"base-url|7.0|nightly": "$(base-url|public|nightly)",

"base-url|6.0-monitor|main": "$(base-url|public|maintenance|main)",
"base-url|6.0-monitor|nightly": "$(base-url|public|maintenance|nightly)",
"base-url|6.1-monitor|main": "$(base-url|public|main)",
"base-url|6.1-monitor|nightly": "$(base-url|public|nightly)",
"base-url|6.2-monitor|main": "$(base-url|public|main)",
Expand All @@ -97,10 +95,6 @@
"libssl|focal": "1.1",
"libssl|jammy": "3",

"monitor|6.0|build-version": "6.0.2-servicing.22077.7",
"monitor|6.0|product-version": "6.0.2",
"monitor|6.0|sha": "3203e455fe4fa9e7b251ba957ddf286a3a3fcf1c88663315547d5f4f7df9ee1c1f164dfcc42edeebaf786bf1b893753c5a5339377b259798208d5f07c48f9a10",

"monitor|6.1|build-version": "6.1.1",
"monitor|6.1|product-version": "6.1.1",
"monitor|6.1|sha": "94dae789f43304656198751d183389502b8076913ac0924d3269f74463b4d2b90c7514658dad910a39ccc6e1d1f9e5cd7f7bd036a807588c08c389b5aba6b5ce",
Expand Down
53 changes: 0 additions & 53 deletions src/monitor/6.0/alpine/amd64/Dockerfile
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion tests/Microsoft.DotNet.Docker.Tests/TestData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ public static class TestData

private static readonly MonitorImageData[] s_linuxMonitorTestData =
{
new MonitorImageData { Version = V6_0, RuntimeVersion = V6_0, OS = OS.Alpine315, OSTag = OS.Alpine, Arch = Arch.Amd64 },
new MonitorImageData { Version = V6_1, RuntimeVersion = V6_0, OS = OS.Alpine315, OSTag = OS.Alpine, Arch = Arch.Amd64 },
new MonitorImageData { Version = V6_1, RuntimeVersion = V6_0, OS = OS.Mariner10, OSTag = OS.Mariner, Arch = Arch.Amd64 },
new MonitorImageData { Version = V7_0, RuntimeVersion = V7_0, OS = OS.Alpine315, OSTag = OS.Alpine, Arch = Arch.Amd64 },
Expand Down