From 3739ebf9f8fa2cc85eb3b73bc00fca467672771f Mon Sep 17 00:00:00 2001 From: Justin Anderson Date: Tue, 17 May 2022 10:35:32 -0700 Subject: [PATCH] Remove .NET Monitor 6.0 Dockerfiles (#3770) * Remove dotnet-monitor 6.0 image (#3742) * Remove unused .NET Monitor 6.0 version variables (#3759) Co-authored-by: Patrick Fenelon --- README.monitor.md | 1 - .../monitor-tags.yml | 1 - manifest.json | 25 --------- manifest.versions.json | 6 --- src/monitor/6.0/alpine/amd64/Dockerfile | 53 ------------------- .../Microsoft.DotNet.Docker.Tests/TestData.cs | 1 - 6 files changed, 87 deletions(-) delete mode 100644 src/monitor/6.0/alpine/amd64/Dockerfile diff --git a/README.monitor.md b/README.monitor.md index a11a9fdb79..6298aad389 100644 --- a/README.monitor.md +++ b/README.monitor.md @@ -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 diff --git a/eng/mcr-tags-metadata-templates/monitor-tags.yml b/eng/mcr-tags-metadata-templates/monitor-tags.yml index baef90a483..4d60f170b0 100644 --- a/eng/mcr-tags-metadata-templates/monitor-tags.yml +++ b/eng/mcr-tags-metadata-templates/monitor-tags.yml @@ -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) diff --git a/manifest.json b/manifest.json index 90dd9dc304..c65cfd3d98 100644 --- a/manifest.json +++ b/manifest.json @@ -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": { diff --git a/manifest.versions.json b/manifest.versions.json index 37f32419ed..30e815b194 100644 --- a/manifest.versions.json +++ b/manifest.versions.json @@ -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)", @@ -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", diff --git a/src/monitor/6.0/alpine/amd64/Dockerfile b/src/monitor/6.0/alpine/amd64/Dockerfile deleted file mode 100644 index 37a1f3f11d..0000000000 --- a/src/monitor/6.0/alpine/amd64/Dockerfile +++ /dev/null @@ -1,53 +0,0 @@ -ARG ASPNET_REPO=mcr.microsoft.com/dotnet/aspnet -ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk - -# Installer image -FROM $SDK_REPO:6.0.300-alpine3.15-amd64 AS installer - -# Install .NET Monitor -ENV DOTNET_MONITOR_VERSION=6.0.2 -RUN wget -O dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/6.0.2-servicing.22077.7/dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg \ - && dotnetmonitor_sha512='3203e455fe4fa9e7b251ba957ddf286a3a3fcf1c88663315547d5f4f7df9ee1c1f164dfcc42edeebaf786bf1b893753c5a5339377b259798208d5f07c48f9a10' \ - && echo "$dotnetmonitor_sha512 dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg" | sha512sum -c - \ - && dotnet tool install dotnet-monitor --tool-path /app --add-source / --version $DOTNET_MONITOR_VERSION --framework net6.0 --no-cache \ - # To reduce image size, remove all non-net6.0 TFMs - # To do this safely, we need to first find everything that dotnet tool installed named "dotnet-monitor". - # The /dotnet-monitor/ folder exists under .store which is not a stable constant to rely on. The result is multi stage search: - # 1. Find any files in /app - # 2. Match anything that is under a *folder* called 'dotnet-monitor' - # 3. Match anything from step 2 that isn't in a '/tools/net6.0' folder (/tools is the folder we use in a nuget file that is stable) - # 4. Delete everything from step 3 - && find /app -type f -print | grep -i '.*/dotnet-monitor/.*' | grep -v -i '.*/tools/net6[.]0' | xargs rm -rf \ - # To reduce image size further, remove the non-linux assemblies - && find /app -type f -print | grep -i '.*/dotnet-monitor/.*' | grep -i -E '/(runtimes|shims)/(win|osx)' | xargs rm -rf \ - # Remove all the empty directories left by the previous step - && find /app -type d -empty -delete \ - && rm dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg - - -# Monitor image -FROM $ASPNET_REPO:6.0.5-alpine3.15-amd64 - -WORKDIR /app -COPY --from=installer /app . - -ENV \ - # Unset ASPNETCORE_URLS from aspnet base image - ASPNETCORE_URLS= \ - # Disable debugger and profiler diagnostics to avoid diagnosing self. - COMPlus_EnableDiagnostics=0 \ - # Default Filter - DefaultProcess__Filters__0__Key=ProcessId \ - DefaultProcess__Filters__0__Value=1 \ - # Logging: JSON format so that analytic platforms can get discrete entry information - Logging__Console__FormatterName=json \ - # Logging: Use round-trip date/time format without timezone information (always logged in UTC) - Logging__Console__FormatterOptions__TimestampFormat=yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffff'Z' \ - # Logging: Write timestamps using UTC offset (+0:00) - Logging__Console__FormatterOptions__UseUtcTimestamp=true \ - # Add dotnet-monitor path to front of PATH for easier, prioritized execution - PATH="/app:${PATH}" - -RUN chmod 755 dotnet-monitor - -ENTRYPOINT [ "dotnet-monitor", "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ] diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs index 33e8dcbde5..936b125941 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs @@ -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 },