From 3b4da747be75ca74af9e3eece8082ac9673a57ab Mon Sep 17 00:00:00 2001 From: dotnet-docker-bot <60522487+dotnet-docker-bot@users.noreply.github.com> Date: Thu, 10 Oct 2024 09:57:08 -0700 Subject: [PATCH] [nightly] Update dependencies from dotnet/dotnet-monitor/9.0 (#5964) --- README.monitor-base.md | 4 ++-- README.monitor.md | 4 ++-- manifest.versions.json | 18 +++++++++--------- .../9.0/azurelinux-distroless/amd64/Dockerfile | 6 +++--- .../azurelinux-distroless/arm64v8/Dockerfile | 6 +++--- .../9.0/azurelinux-distroless/amd64/Dockerfile | 12 ++++++------ .../azurelinux-distroless/arm64v8/Dockerfile | 12 ++++++------ 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/README.monitor-base.md b/README.monitor-base.md index 23faf00396..59e5881002 100644 --- a/README.monitor-base.md +++ b/README.monitor-base.md @@ -61,7 +61,7 @@ The following Dockerfiles demonstrate how you can use this base image to build a Tags | Dockerfile | OS Version -----------| -------------| ------------- -9.0.0-rc.2-amd64, 9.0-amd64, 9.0.0-rc.2, 9.0, 9, latest | [Dockerfile](src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 +9.0.0-amd64, 9.0-amd64, 9.0.0, 9.0, 9, latest | [Dockerfile](src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 8.0.5-ubuntu-chiseled-amd64, 8.0-ubuntu-chiseled-amd64, 8.0.5-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.5, 8.0 | [Dockerfile](src/monitor-base/8.0/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04 8.0.5-cbl-mariner-distroless-amd64, 8.0-cbl-mariner-distroless-amd64, 8.0.5-cbl-mariner-distroless, 8.0-cbl-mariner-distroless | [Dockerfile](src/monitor-base/8.0/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0 @@ -76,7 +76,7 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- -9.0.0-rc.2-arm64v8, 9.0-arm64v8, 9.0.0-rc.2, 9.0, 9, latest | [Dockerfile](src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 +9.0.0-arm64v8, 9.0-arm64v8, 9.0.0, 9.0, 9, latest | [Dockerfile](src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 8.0.5-ubuntu-chiseled-arm64v8, 8.0-ubuntu-chiseled-arm64v8, 8.0.5-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.5, 8.0 | [Dockerfile](src/monitor-base/8.0/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04 8.0.5-cbl-mariner-distroless-arm64v8, 8.0-cbl-mariner-distroless-arm64v8, 8.0.5-cbl-mariner-distroless, 8.0-cbl-mariner-distroless | [Dockerfile](src/monitor-base/8.0/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0 diff --git a/README.monitor.md b/README.monitor.md index f49cc68f7c..b4e51a88d7 100644 --- a/README.monitor.md +++ b/README.monitor.md @@ -62,7 +62,7 @@ See the [documentation](https://go.microsoft.com/fwlink/?linkid=2158052) for how Tags | Dockerfile | OS Version -----------| -------------| ------------- -9.0.0-rc.2, 9.0, 9, latest | [Dockerfile](src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 +9.0.0, 9.0, 9, latest | [Dockerfile](src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 8.0.5-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.5, 8.0 | [Dockerfile](src/monitor/8.0/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04 8.0.5-cbl-mariner-distroless, 8.0-cbl-mariner-distroless | [Dockerfile](src/monitor/8.0/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0 6.3.9-alpine, 6.3-alpine, 6-alpine, 6.3.9, 6.3, 6 | [Dockerfile](src/monitor/6.3/alpine/amd64/Dockerfile) | Alpine 3.20 @@ -81,7 +81,7 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- -9.0.0-rc.2, 9.0, 9, latest | [Dockerfile](src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 +9.0.0, 9.0, 9, latest | [Dockerfile](src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 8.0.5-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.5, 8.0 | [Dockerfile](src/monitor/8.0/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04 8.0.5-cbl-mariner-distroless, 8.0-cbl-mariner-distroless | [Dockerfile](src/monitor/8.0/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0 6.3.9-alpine, 6.3-alpine, 6-alpine, 6.3.9, 6.3, 6 | [Dockerfile](src/monitor/6.3/alpine/arm64v8/Dockerfile) | Alpine 3.20 diff --git a/manifest.versions.json b/manifest.versions.json index 6744ac22d4..6435c6287b 100644 --- a/manifest.versions.json +++ b/manifest.versions.json @@ -164,19 +164,19 @@ "monitor-ext-s3storage|8.1|linux|x64|sha": "dee5d014d399ef618750e8905be9375df829b6e2649ac4d8cc2072fdd14fb5ff18222e9db9bf7ec8f6a0a1f6141d5a1f7722a3d2a321989f72db30a282e5c289", "monitor-ext-s3storage|8.1|linux|arm64|sha": "9029e2b4f770c2f4ecbd367c77f5f9247f8ec6f07af4c0bdcc9b98826d69b1523e7b9b064c3b70556b6f353d9421deda033fb04e0e47457901e91be4bfeffa30", - "monitor|9.0|build-version": "9.0.0-rc.2.24504.9", - "monitor|9.0|product-version": "9.0.0-rc.2", + "monitor|9.0|build-version": "9.0.0-rtm.24509.9", + "monitor|9.0|product-version": "9.0.0", "monitor|9.0|fixed-tag": "$(monitor|9.0|product-version)", "monitor|9.0|minor-tag": "9.0", "monitor|9|major-tag": "9", "monitor|9.0|base-url|main": "$(base-url|public|preview|main)", - "monitor|9.0|base-url|nightly": "$(base-url|public|maintenance|nightly)", - "monitor-base|9.0|linux|x64|sha": "ebb0b1cb0c3d88ba17787c895df6397e1781a1be274d6f874cb13ee67208f546b5d9b3f93a3c3cf6af43f497c6608a90ca4761cce6c6f431e351fd5c808819b4", - "monitor-base|9.0|linux|arm64|sha": "f30feb3e73db1abf90dcfa1c9ab990d842507f0f6d8f8001229f34fb2f7f804e157c37e9bd23299840ac74ad03134963c629f30579fb62581f20f97698ca6fb9", - "monitor-ext-azureblobstorage|9.0|linux|x64|sha": "03b535a031686637ea10d792b79014b5d32e0327e704d8eb5f2a308534cdfb47e7f1c506ad7d4e3322b6ffd7b3386d3838f399b590e548293c5e4d55a191fe88", - "monitor-ext-azureblobstorage|9.0|linux|arm64|sha": "0b035ef3e8d3462814f5cc89821d5e0b44a072f880369d032dbd406194cfc929776a9434c678019d3089acf23f27b4626c9e42f706c132b4da5e4e4e4ebc4977", - "monitor-ext-s3storage|9.0|linux|x64|sha": "2d4f745635683ee53b01b09cf39eabf9b16190145da9ba1adb930f066761b8791ef8b65aa6e94aa8a0cfc1997c9da2f7e0a05c3ea0e3ab81b01eb6dc6c068345", - "monitor-ext-s3storage|9.0|linux|arm64|sha": "900ee19ba16437b29702bf4380e2d5cfd4a478e4d8bea8286f92e768258a6030ba57846ec00ec52b6b35b9462559122595c7725498472c9f11622eac9f253e96", + "monitor|9.0|base-url|nightly": "$(base-url|public|preview|nightly)", + "monitor-base|9.0|linux|x64|sha": "9e1052943227214b8c0d6dcf6442b244020655a7e82cf0f365941edcc606b9c77fb2ee15656225d996e9243f67b38963de0eabb7de444f146f013ef859e363cd", + "monitor-base|9.0|linux|arm64|sha": "c20cce29d27d64f7a160049c7ea0164c02da13c990c73a8b3fdae4c71b724b2621ca08592a162b9b3e3bd86e11f4aaf2a0b7433d1f8c1bf105b70f4f7e0c7e09", + "monitor-ext-azureblobstorage|9.0|linux|x64|sha": "b7d6debe56617a100721a338d54e5f682db1aaaaca1c618aac44024a263a338c408785ee4c201a2c4994644566819524d47c168e75ccd317123eefcb2a179ce6", + "monitor-ext-azureblobstorage|9.0|linux|arm64|sha": "a0397ce166dc7c7b88691d4bfb93b9e089c055848d878173567a7f9378d39b29950376612674d4ac3edbb14e05cac8cc9bfd55cd4705547adcd0f773e1d590ef", + "monitor-ext-s3storage|9.0|linux|x64|sha": "c48f8d26a11a42e2095ef02391fd2285dde9788ca9fbca02c370efb532ae945ba13a9070e2702d6afe5790f0483a2e7e3bd0b2b6a0c33e1d4fa5312d56881cac", + "monitor-ext-s3storage|9.0|linux|arm64|sha": "b1ec3cc9ca289d88488249e0ac3d89a77e513a11540e980d73667e2f522dbacc7111526506a5f46c9f77a02ca60b62efa2a403c9dbc0b4652c9db3a98a8bc4e3", "netstandard-targeting-pack-2.1.0|linux-rpm|x64|sha": "fab41a86b9182b276992795247868c093890c6b3d5739376374a302430229624944998e054de0ff99bddd9459fc9543636df1ebd5392db069ae953ac17ea2880", diff --git a/src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile b/src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile index d6505ca8f1..f19b663090 100644 --- a/src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile +++ b/src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile @@ -10,9 +10,9 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve .NET Monitor Base -RUN dotnet_monitor_version=9.0.0-rc.2.24504.9 \ - && curl -fSL --output dotnet-monitor-base.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \ - && dotnet_monitor_base_sha512='ebb0b1cb0c3d88ba17787c895df6397e1781a1be274d6f874cb13ee67208f546b5d9b3f93a3c3cf6af43f497c6608a90ca4761cce6c6f431e351fd5c808819b4' \ +RUN dotnet_monitor_version=9.0.0 \ + && curl -fSL --output dotnet-monitor-base.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/9.0.0-rtm.24509.9/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \ + && dotnet_monitor_base_sha512='9e1052943227214b8c0d6dcf6442b244020655a7e82cf0f365941edcc606b9c77fb2ee15656225d996e9243f67b38963de0eabb7de444f146f013ef859e363cd' \ && echo "$dotnet_monitor_base_sha512 dotnet-monitor-base.tar.gz" | sha512sum -c - \ && mkdir -p /app \ && tar -oxzf dotnet-monitor-base.tar.gz -C /app \ diff --git a/src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile b/src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile index 8f58040e02..f886b3eb4e 100644 --- a/src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile +++ b/src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile @@ -10,9 +10,9 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve .NET Monitor Base -RUN dotnet_monitor_version=9.0.0-rc.2.24504.9 \ - && curl -fSL --output dotnet-monitor-base.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \ - && dotnet_monitor_base_sha512='f30feb3e73db1abf90dcfa1c9ab990d842507f0f6d8f8001229f34fb2f7f804e157c37e9bd23299840ac74ad03134963c629f30579fb62581f20f97698ca6fb9' \ +RUN dotnet_monitor_version=9.0.0 \ + && curl -fSL --output dotnet-monitor-base.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/9.0.0-rtm.24509.9/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \ + && dotnet_monitor_base_sha512='c20cce29d27d64f7a160049c7ea0164c02da13c990c73a8b3fdae4c71b724b2621ca08592a162b9b3e3bd86e11f4aaf2a0b7433d1f8c1bf105b70f4f7e0c7e09' \ && echo "$dotnet_monitor_base_sha512 dotnet-monitor-base.tar.gz" | sha512sum -c - \ && mkdir -p /app \ && tar -oxzf dotnet-monitor-base.tar.gz -C /app \ diff --git a/src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile b/src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile index 6b2726791a..0b55438f8e 100644 --- a/src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile +++ b/src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile @@ -10,13 +10,13 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve .NET Monitor extensions -RUN dotnet_monitor_extension_version=9.0.0-rc.2.24504.9 \ - && curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz \ - && dotnet_monitor_extension_sha512='03b535a031686637ea10d792b79014b5d32e0327e704d8eb5f2a308534cdfb47e7f1c506ad7d4e3322b6ffd7b3386d3838f399b590e548293c5e4d55a191fe88' \ +RUN dotnet_monitor_extension_version=9.0.0 \ + && curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/9.0.0-rtm.24509.9/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz \ + && dotnet_monitor_extension_sha512='b7d6debe56617a100721a338d54e5f682db1aaaaca1c618aac44024a263a338c408785ee4c201a2c4994644566819524d47c168e75ccd317123eefcb2a179ce6' \ && echo "$dotnet_monitor_extension_sha512 dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \ \ - && curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz \ - && dotnet_monitor_extension_sha512='2d4f745635683ee53b01b09cf39eabf9b16190145da9ba1adb930f066761b8791ef8b65aa6e94aa8a0cfc1997c9da2f7e0a05c3ea0e3ab81b01eb6dc6c068345' \ + && curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/9.0.0-rtm.24509.9/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz \ + && dotnet_monitor_extension_sha512='c48f8d26a11a42e2095ef02391fd2285dde9788ca9fbca02c370efb532ae945ba13a9070e2702d6afe5790f0483a2e7e3bd0b2b6a0c33e1d4fa5312d56881cac' \ && echo "$dotnet_monitor_extension_sha512 dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \ \ && mkdir -p /app \ @@ -27,6 +27,6 @@ RUN dotnet_monitor_extension_version=9.0.0-rc.2.24504.9 \ # .NET Monitor image -FROM $REPO:9.0.0-rc.2-amd64 +FROM $REPO:9.0.0-amd64 COPY --from=installer ["/app", "/app"] diff --git a/src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile b/src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile index 775567f5fb..663b3d2069 100644 --- a/src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile +++ b/src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile @@ -10,13 +10,13 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve .NET Monitor extensions -RUN dotnet_monitor_extension_version=9.0.0-rc.2.24504.9 \ - && curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \ - && dotnet_monitor_extension_sha512='0b035ef3e8d3462814f5cc89821d5e0b44a072f880369d032dbd406194cfc929776a9434c678019d3089acf23f27b4626c9e42f706c132b4da5e4e4e4ebc4977' \ +RUN dotnet_monitor_extension_version=9.0.0 \ + && curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/9.0.0-rtm.24509.9/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \ + && dotnet_monitor_extension_sha512='a0397ce166dc7c7b88691d4bfb93b9e089c055848d878173567a7f9378d39b29950376612674d4ac3edbb14e05cac8cc9bfd55cd4705547adcd0f773e1d590ef' \ && echo "$dotnet_monitor_extension_sha512 dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \ \ - && curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://dotnetcli.azureedge.net/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \ - && dotnet_monitor_extension_sha512='900ee19ba16437b29702bf4380e2d5cfd4a478e4d8bea8286f92e768258a6030ba57846ec00ec52b6b35b9462559122595c7725498472c9f11622eac9f253e96' \ + && curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/9.0.0-rtm.24509.9/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \ + && dotnet_monitor_extension_sha512='b1ec3cc9ca289d88488249e0ac3d89a77e513a11540e980d73667e2f522dbacc7111526506a5f46c9f77a02ca60b62efa2a403c9dbc0b4652c9db3a98a8bc4e3' \ && echo "$dotnet_monitor_extension_sha512 dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \ \ && mkdir -p /app \ @@ -27,6 +27,6 @@ RUN dotnet_monitor_extension_version=9.0.0-rc.2.24504.9 \ # .NET Monitor image -FROM $REPO:9.0.0-rc.2-arm64v8 +FROM $REPO:9.0.0-arm64v8 COPY --from=installer ["/app", "/app"]