From 133de5e8590dd85724e3d86c40ec04529ad7e543 Mon Sep 17 00:00:00 2001 From: kkeirstead Date: Mon, 4 Aug 2025 13:51:39 -0700 Subject: [PATCH] Manually ran script --- README.monitor-base.md | 4 ++-- README.monitor.md | 4 ++-- manifest.versions.json | 16 ++++++++-------- .../9.0/azurelinux-distroless/amd64/Dockerfile | 6 +++--- .../9.0/azurelinux-distroless/arm64v8/Dockerfile | 6 +++--- .../9.0/azurelinux-distroless/amd64/Dockerfile | 12 ++++++------ .../9.0/azurelinux-distroless/arm64v8/Dockerfile | 12 ++++++------ 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/README.monitor-base.md b/README.monitor-base.md index 3b068e7af5..77f1b53968 100644 --- a/README.monitor-base.md +++ b/README.monitor-base.md @@ -54,7 +54,7 @@ The following Dockerfiles demonstrate how you can use this base image to build a Tags | Dockerfile | OS Version -----------| -------------| ------------- -9.0.3-amd64, 9.0-amd64, 9.0.3, 9.0, 9 | [Dockerfile](src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 +9.0.4-amd64, 9.0-amd64, 9.0.4, 9.0, 9 | [Dockerfile](src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 8.1.2-ubuntu-chiseled-amd64, 8.1-ubuntu-chiseled-amd64, 8-ubuntu-chiseled-amd64, 8.1.2-ubuntu-chiseled, 8.1-ubuntu-chiseled, 8-ubuntu-chiseled, 8.1.2, 8.1, 8 | [Dockerfile](src/monitor-base/8.1/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04 8.1.2-azurelinux-distroless-amd64, 8.1-azurelinux-distroless-amd64, 8-azurelinux-distroless-amd64, 8.1.2-azurelinux-distroless, 8.1-azurelinux-distroless, 8-azurelinux-distroless | [Dockerfile](src/monitor-base/8.1/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 @@ -68,7 +68,7 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- -9.0.3-arm64v8, 9.0-arm64v8, 9.0.3, 9.0, 9 | [Dockerfile](src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 +9.0.4-arm64v8, 9.0-arm64v8, 9.0.4, 9.0, 9 | [Dockerfile](src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 8.1.2-ubuntu-chiseled-arm64v8, 8.1-ubuntu-chiseled-arm64v8, 8-ubuntu-chiseled-arm64v8, 8.1.2-ubuntu-chiseled, 8.1-ubuntu-chiseled, 8-ubuntu-chiseled, 8.1.2, 8.1, 8 | [Dockerfile](src/monitor-base/8.1/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04 8.1.2-azurelinux-distroless-arm64v8, 8.1-azurelinux-distroless-arm64v8, 8-azurelinux-distroless-arm64v8, 8.1.2-azurelinux-distroless, 8.1-azurelinux-distroless, 8-azurelinux-distroless | [Dockerfile](src/monitor-base/8.1/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 diff --git a/README.monitor.md b/README.monitor.md index 0e5371a35e..20883cc260 100644 --- a/README.monitor.md +++ b/README.monitor.md @@ -53,7 +53,7 @@ See [documentation](https://go.microsoft.com/fwlink/?linkid=2158052) for how to Tags | Dockerfile | OS Version -----------| -------------| ------------- -9.0.3, 9.0, 9 | [Dockerfile](src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 +9.0.4, 9.0, 9 | [Dockerfile](src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 8.1.2-ubuntu-chiseled, 8.1-ubuntu-chiseled, 8-ubuntu-chiseled, 8.1.2, 8.1, 8 | [Dockerfile](src/monitor/8.1/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04 8.1.2-azurelinux-distroless, 8.1-azurelinux-distroless, 8-azurelinux-distroless | [Dockerfile](src/monitor/8.1/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 @@ -67,7 +67,7 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- -9.0.3, 9.0, 9 | [Dockerfile](src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 +9.0.4, 9.0, 9 | [Dockerfile](src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 8.1.2-ubuntu-chiseled, 8.1-ubuntu-chiseled, 8-ubuntu-chiseled, 8.1.2, 8.1, 8 | [Dockerfile](src/monitor/8.1/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04 8.1.2-azurelinux-distroless, 8.1-azurelinux-distroless, 8-azurelinux-distroless | [Dockerfile](src/monitor/8.1/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 diff --git a/manifest.versions.json b/manifest.versions.json index ad435df17c..901d103ee0 100644 --- a/manifest.versions.json +++ b/manifest.versions.json @@ -124,18 +124,18 @@ "monitor|9|major-tag": "9", "monitor|9|major-preview-tag": "9-preview", - "monitor|9.0|build-version": "9.0.3-servicing.25257.4", - "monitor|9.0|product-version": "9.0.3", + "monitor|9.0|build-version": "9.0.4-servicing.25381.4", + "monitor|9.0|product-version": "9.0.4", "monitor|9.0|fixed-tag": "$(monitor|9.0|product-version)", "monitor|9.0|minor-tag": "9.0", "monitor|9.0|base-url|main": "$(base-url|public|maintenance|main)", "monitor|9.0|base-url|nightly": "$(base-url|public|preview|nightly)", - "monitor-base|9.0|linux|x64|sha": "2894e7396db9206bc58046d5c2e65869982f79371d75699c42016de3eb6428a896efe5dfe728bfba938ddf5996775654108963f10250b860d30e125b41c08bae", - "monitor-base|9.0|linux|arm64|sha": "5ca28abad6a351b75db69d0cda5acb2687efbcb6fc67f27b742287f768ff2d362f4f824b3a3a58a0b2206b1a2725ff8b381b714926e7f9368227dbba70b4e98f", - "monitor-ext-azureblobstorage|9.0|linux|x64|sha": "cc8b1dafcb632fb3a826e9b57fb71519c7918d0debd5e2172f82c430ac8c20df73c63fefb82179768c6b75d346cc3eac026b96e41e1bad19c94b283f771934fc", - "monitor-ext-azureblobstorage|9.0|linux|arm64|sha": "c11699ea8d20cec13d091c7d5f9d0b70aae7c04a522a4d0d7fc5f1763e703817f43800f8f180797dabc3ad166255f3e7c9f3169bcf650ae05663fdd790c01cc9", - "monitor-ext-s3storage|9.0|linux|x64|sha": "23df20e9cbaa82137d5860f51251de57922e9a4ab02d8ac9fa714f0a5dd98c0a7a8455bfb8bce70fdb0fd56070c394407ea43a4a163a20df47cb245db180e1e2", - "monitor-ext-s3storage|9.0|linux|arm64|sha": "9c3d13a3afc9250beb879d52d489b6c3949beedc676a94a96932df27e8a294458fc1aa3b4d942fdfbe4fdfa9f642ae4412915d2ef6195482d1012e1b86f92216", + "monitor-base|9.0|linux|x64|sha": "c92d565cc20e26a844e80abf3fcfd7370f1a3c1fc8e5aeb3c7f2ff866f639173feb929f252d58fd7e46f6adfe33490f93cf6385cb5c30533a941027a5440dbaa", + "monitor-base|9.0|linux|arm64|sha": "1a413e54b91008d46ab3e62ae89ca4fc3d9434cb0887568a0066a041cdd5381bd3471fdde2c29307f908012269204188fb276f4b47c9541e4d4163d453f773bb", + "monitor-ext-azureblobstorage|9.0|linux|x64|sha": "148829545003d93d5c25f5ed3e5c014fbd5fd24b64c62c807f9b7453ad41b9a65284b4010b52f91799930c4613b74302afbba9546dbd16c0cd03297a70066b6f", + "monitor-ext-azureblobstorage|9.0|linux|arm64|sha": "9a67d9f446facf58b14ee0a4c658042d0eb80f4c3e643d23f86b62cba390ec6ecc1b9cc368788fb502a827a0aaa6d3a78c0ae3f29a6bc472ccf1a8cda2a58a46", + "monitor-ext-s3storage|9.0|linux|x64|sha": "bf9bf621a9eda4f2abde20b23ea4b45163141a0850cebdbf904e22a92c55b586a0feb1a7ae0f4324a7eb67fad116507b472289c107518daa05c47f930e40e560", + "monitor-ext-s3storage|9.0|linux|arm64|sha": "29c4e18df902ef25992bff8b7b1a33ef3ea6e7a18e27f23052c2890c1d949c9f2efb0150c6823b0a8d77a1de479940d14a4451b6cf6868f5d0188385fe62b0dd", "monitor|9.1|build-version": "9.1.0-preview.3.25363.1", "monitor|9.1|product-version": "9.1.0-preview.3", diff --git a/src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile b/src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile index 07cb14202f..cbee7c5f88 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.3 \ - && curl --fail --show-error --location --output dotnet-monitor-base.tar.gz https://ci.dot.net/public/diagnostics/monitor/9.0.3-servicing.25257.4/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \ - && dotnet_monitor_base_sha512='2894e7396db9206bc58046d5c2e65869982f79371d75699c42016de3eb6428a896efe5dfe728bfba938ddf5996775654108963f10250b860d30e125b41c08bae' \ +RUN dotnet_monitor_version=9.0.4 \ + && curl --fail --show-error --location --output dotnet-monitor-base.tar.gz https://ci.dot.net/public/diagnostics/monitor/9.0.4-servicing.25381.4/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \ + && dotnet_monitor_base_sha512='c92d565cc20e26a844e80abf3fcfd7370f1a3c1fc8e5aeb3c7f2ff866f639173feb929f252d58fd7e46f6adfe33490f93cf6385cb5c30533a941027a5440dbaa' \ && echo "$dotnet_monitor_base_sha512 dotnet-monitor-base.tar.gz" | sha512sum -c - \ && mkdir --parents /app \ && tar --gzip --extract --no-same-owner --file dotnet-monitor-base.tar.gz --directory /app \ diff --git a/src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile b/src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile index e8ce2cd732..c53569244f 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.3 \ - && curl --fail --show-error --location --output dotnet-monitor-base.tar.gz https://ci.dot.net/public/diagnostics/monitor/9.0.3-servicing.25257.4/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \ - && dotnet_monitor_base_sha512='5ca28abad6a351b75db69d0cda5acb2687efbcb6fc67f27b742287f768ff2d362f4f824b3a3a58a0b2206b1a2725ff8b381b714926e7f9368227dbba70b4e98f' \ +RUN dotnet_monitor_version=9.0.4 \ + && curl --fail --show-error --location --output dotnet-monitor-base.tar.gz https://ci.dot.net/public/diagnostics/monitor/9.0.4-servicing.25381.4/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \ + && dotnet_monitor_base_sha512='1a413e54b91008d46ab3e62ae89ca4fc3d9434cb0887568a0066a041cdd5381bd3471fdde2c29307f908012269204188fb276f4b47c9541e4d4163d453f773bb' \ && echo "$dotnet_monitor_base_sha512 dotnet-monitor-base.tar.gz" | sha512sum -c - \ && mkdir --parents /app \ && tar --gzip --extract --no-same-owner --file dotnet-monitor-base.tar.gz --directory /app \ diff --git a/src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile b/src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile index 82e4190f63..432d16248f 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.3 \ +RUN dotnet_monitor_extension_version=9.0.4 \ && curl --fail --show-error --location \ - --output dotnet-monitor-egress-azureblobstorage.tar.gz https://ci.dot.net/public/diagnostics/monitor/9.0.3-servicing.25257.4/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz \ - --output dotnet-monitor-egress-s3storage.tar.gz https://ci.dot.net/public/diagnostics/monitor/9.0.3-servicing.25257.4/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz \ - && dotnet_monitor_azureblobstorage_sha512='cc8b1dafcb632fb3a826e9b57fb71519c7918d0debd5e2172f82c430ac8c20df73c63fefb82179768c6b75d346cc3eac026b96e41e1bad19c94b283f771934fc' \ + --output dotnet-monitor-egress-azureblobstorage.tar.gz https://ci.dot.net/public/diagnostics/monitor/9.0.4-servicing.25381.4/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz \ + --output dotnet-monitor-egress-s3storage.tar.gz https://ci.dot.net/public/diagnostics/monitor/9.0.4-servicing.25381.4/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz \ + && dotnet_monitor_azureblobstorage_sha512='148829545003d93d5c25f5ed3e5c014fbd5fd24b64c62c807f9b7453ad41b9a65284b4010b52f91799930c4613b74302afbba9546dbd16c0cd03297a70066b6f' \ && echo "$dotnet_monitor_azureblobstorage_sha512 dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \ - && dotnet_monitor_s3storage_sha512='23df20e9cbaa82137d5860f51251de57922e9a4ab02d8ac9fa714f0a5dd98c0a7a8455bfb8bce70fdb0fd56070c394407ea43a4a163a20df47cb245db180e1e2' \ + && dotnet_monitor_s3storage_sha512='bf9bf621a9eda4f2abde20b23ea4b45163141a0850cebdbf904e22a92c55b586a0feb1a7ae0f4324a7eb67fad116507b472289c107518daa05c47f930e40e560' \ && echo "$dotnet_monitor_s3storage_sha512 dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \ && mkdir --parents /app \ && tar --gzip --extract --no-same-owner --file dotnet-monitor-egress-azureblobstorage.tar.gz --directory /app \ @@ -27,6 +27,6 @@ RUN dotnet_monitor_extension_version=9.0.3 \ # .NET Monitor image -FROM $REPO:9.0.3-amd64 +FROM $REPO:9.0.4-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 2bad93f3cb..a353572ff7 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.3 \ +RUN dotnet_monitor_extension_version=9.0.4 \ && curl --fail --show-error --location \ - --output dotnet-monitor-egress-azureblobstorage.tar.gz https://ci.dot.net/public/diagnostics/monitor/9.0.3-servicing.25257.4/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \ - --output dotnet-monitor-egress-s3storage.tar.gz https://ci.dot.net/public/diagnostics/monitor/9.0.3-servicing.25257.4/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \ - && dotnet_monitor_azureblobstorage_sha512='c11699ea8d20cec13d091c7d5f9d0b70aae7c04a522a4d0d7fc5f1763e703817f43800f8f180797dabc3ad166255f3e7c9f3169bcf650ae05663fdd790c01cc9' \ + --output dotnet-monitor-egress-azureblobstorage.tar.gz https://ci.dot.net/public/diagnostics/monitor/9.0.4-servicing.25381.4/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \ + --output dotnet-monitor-egress-s3storage.tar.gz https://ci.dot.net/public/diagnostics/monitor/9.0.4-servicing.25381.4/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \ + && dotnet_monitor_azureblobstorage_sha512='9a67d9f446facf58b14ee0a4c658042d0eb80f4c3e643d23f86b62cba390ec6ecc1b9cc368788fb502a827a0aaa6d3a78c0ae3f29a6bc472ccf1a8cda2a58a46' \ && echo "$dotnet_monitor_azureblobstorage_sha512 dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \ - && dotnet_monitor_s3storage_sha512='9c3d13a3afc9250beb879d52d489b6c3949beedc676a94a96932df27e8a294458fc1aa3b4d942fdfbe4fdfa9f642ae4412915d2ef6195482d1012e1b86f92216' \ + && dotnet_monitor_s3storage_sha512='29c4e18df902ef25992bff8b7b1a33ef3ea6e7a18e27f23052c2890c1d949c9f2efb0150c6823b0a8d77a1de479940d14a4451b6cf6868f5d0188385fe62b0dd' \ && echo "$dotnet_monitor_s3storage_sha512 dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \ && mkdir --parents /app \ && tar --gzip --extract --no-same-owner --file dotnet-monitor-egress-azureblobstorage.tar.gz --directory /app \ @@ -27,6 +27,6 @@ RUN dotnet_monitor_extension_version=9.0.3 \ # .NET Monitor image -FROM $REPO:9.0.3-arm64v8 +FROM $REPO:9.0.4-arm64v8 COPY --from=installer ["/app", "/app"]