diff --git a/README.monitor-base.md b/README.monitor-base.md index 625fb94921..52b96639e3 100644 --- a/README.monitor-base.md +++ b/README.monitor-base.md @@ -53,7 +53,7 @@ The following Dockerfiles demonstrate how you can use this base image to build a Tags | Dockerfile | OS Version ---- | ---------- | ---------- -10.0.4-amd64, 10.0-amd64, 10.0.4, 10.0, 10, latest | [Dockerfile](src/monitor-base/10.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 +10.0.4-preview.1-amd64, 10.0-amd64, 10.0.4-preview.1, 10.0, 10, latest | [Dockerfile](src/monitor-base/10.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 9.0.6-amd64, 9.0-amd64, 9.0.6, 9.0, 9 | [Dockerfile](src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 8.1.4-ubuntu-chiseled-amd64, 8.1-ubuntu-chiseled-amd64, 8-ubuntu-chiseled-amd64, 8.1.4-ubuntu-chiseled, 8.1-ubuntu-chiseled, 8-ubuntu-chiseled, 8.1.4, 8.1, 8 | [Dockerfile](src/monitor-base/8.1/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04 8.1.4-azurelinux-distroless-amd64, 8.1-azurelinux-distroless-amd64, 8-azurelinux-distroless-amd64, 8.1.4-azurelinux-distroless, 8.1-azurelinux-distroless, 8-azurelinux-distroless | [Dockerfile](src/monitor-base/8.1/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 @@ -62,7 +62,7 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version ---- | ---------- | ---------- -10.0.4-arm64v8, 10.0-arm64v8, 10.0.4, 10.0, 10, latest | [Dockerfile](src/monitor-base/10.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 +10.0.4-preview.1-arm64v8, 10.0-arm64v8, 10.0.4-preview.1, 10.0, 10, latest | [Dockerfile](src/monitor-base/10.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 9.0.6-arm64v8, 9.0-arm64v8, 9.0.6, 9.0, 9 | [Dockerfile](src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 8.1.4-ubuntu-chiseled-arm64v8, 8.1-ubuntu-chiseled-arm64v8, 8-ubuntu-chiseled-arm64v8, 8.1.4-ubuntu-chiseled, 8.1-ubuntu-chiseled, 8-ubuntu-chiseled, 8.1.4, 8.1, 8 | [Dockerfile](src/monitor-base/8.1/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04 8.1.4-azurelinux-distroless-arm64v8, 8.1-azurelinux-distroless-arm64v8, 8-azurelinux-distroless-arm64v8, 8.1.4-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 20cc45f2d4..b2bc4c327e 100644 --- a/README.monitor.md +++ b/README.monitor.md @@ -54,7 +54,7 @@ See [documentation](https://go.microsoft.com/fwlink/?linkid=2158052) for how to Tags | Dockerfile | OS Version ---- | ---------- | ---------- -10.0.4, 10.0, 10, latest | [Dockerfile](src/monitor/10.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 +10.0.4-preview.1, 10.0, 10, latest | [Dockerfile](src/monitor/10.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 9.0.6, 9.0, 9 | [Dockerfile](src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 8.1.4-ubuntu-chiseled, 8.1-ubuntu-chiseled, 8-ubuntu-chiseled, 8.1.4, 8.1, 8 | [Dockerfile](src/monitor/8.1/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04 8.1.4-azurelinux-distroless, 8.1-azurelinux-distroless, 8-azurelinux-distroless | [Dockerfile](src/monitor/8.1/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 @@ -63,7 +63,7 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version ---- | ---------- | ---------- -10.0.4, 10.0, 10, latest | [Dockerfile](src/monitor/10.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 +10.0.4-preview.1, 10.0, 10, latest | [Dockerfile](src/monitor/10.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 9.0.6, 9.0, 9 | [Dockerfile](src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 8.1.4-ubuntu-chiseled, 8.1-ubuntu-chiseled, 8-ubuntu-chiseled, 8.1.4, 8.1, 8 | [Dockerfile](src/monitor/8.1/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04 8.1.4-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 f0ec69e734..1e2e715ccf 100644 --- a/manifest.versions.json +++ b/manifest.versions.json @@ -169,14 +169,14 @@ "monitor-ext-s3storage|9.0|linux|x64|sha": "0ac83d2d95b575c4f891a1190fc92d4dc5d53203fd50a55ab081d9e0652d5ce11a743cd81dea94f8c96acdc2614b2627009b8f0ffb16ae708061cbf8ed27e1ad", "monitor-ext-s3storage|9.0|linux|arm64|sha": "08a3a4613c3095d1980938ac0ea6a6dc743ce169b9ba9ac861715252b7bd45d1b3027fdfc30fc8d9c5948e56ef34f53c3c6eed9dea3271c2635867a2064ad5fc", - "monitor|10.0|build-version": "10.0.4", - "monitor|10.0|product-version": "10.0.4", + "monitor|10.0|build-version": "10.0.4-preview.1.26504.2", + "monitor|10.0|product-version": "10.0.4-preview.1", "monitor|10.0|fixed-tag": "$(monitor|10.0|product-version)", "monitor|10.0|minor-tag": "10.0", "monitor|10.0|base-url|main": "$(base-url|public|maintenance|main)", - "monitor|10.0|base-url|nightly": "$(base-url|public|maintenance|nightly)", + "monitor|10.0|base-url|nightly": "$(base-url|public|preview|nightly)", "monitor|10.0|base-url|checksums|main": "$(base-url|public-checksums|maintenance|main)", - "monitor|10.0|base-url|checksums|nightly": "$(base-url|public-checksums|maintenance|nightly)", + "monitor|10.0|base-url|checksums|nightly": "$(base-url|public-checksums|preview|nightly)", "powershell|8.0|build-version": "7.4.20", "powershell|8.0|sha-function": "256", diff --git a/src/monitor-base/10.0/azurelinux-distroless/amd64/Dockerfile b/src/monitor-base/10.0/azurelinux-distroless/amd64/Dockerfile index 66d50df47f..249a69b597 100644 --- a/src/monitor-base/10.0/azurelinux-distroless/amd64/Dockerfile +++ b/src/monitor-base/10.0/azurelinux-distroless/amd64/Dockerfile @@ -10,10 +10,10 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve .NET Monitor Base -RUN dotnet_monitor_version=10.0.4 \ +RUN dotnet_monitor_version=10.0.4-preview.1.26504.2 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz.sha512 \ && echo "$(cat dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz.sha512) dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /app \ && tar --gzip --extract --no-same-owner --file dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz --directory /app \ diff --git a/src/monitor-base/10.0/azurelinux-distroless/arm64v8/Dockerfile b/src/monitor-base/10.0/azurelinux-distroless/arm64v8/Dockerfile index 5232b3f1fc..a53167a2b3 100644 --- a/src/monitor-base/10.0/azurelinux-distroless/arm64v8/Dockerfile +++ b/src/monitor-base/10.0/azurelinux-distroless/arm64v8/Dockerfile @@ -10,10 +10,10 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve .NET Monitor Base -RUN dotnet_monitor_version=10.0.4 \ +RUN dotnet_monitor_version=10.0.4-preview.1.26504.2 \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz.sha512 \ && echo "$(cat dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz.sha512) dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /app \ && tar --gzip --extract --no-same-owner --file dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz --directory /app \ diff --git a/src/monitor/10.0/azurelinux-distroless/amd64/Dockerfile b/src/monitor/10.0/azurelinux-distroless/amd64/Dockerfile index c937f2f11c..6bbadeb4cf 100644 --- a/src/monitor/10.0/azurelinux-distroless/amd64/Dockerfile +++ b/src/monitor/10.0/azurelinux-distroless/amd64/Dockerfile @@ -10,12 +10,12 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve .NET Monitor extensions -RUN dotnet_monitor_extension_version=10.0.4 \ +RUN dotnet_monitor_extension_version=10.0.4-preview.1.26504.2 \ && curl --fail --show-error --location \ - --output dotnet-monitor-egress-azureblobstorage.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz \ - --output dotnet-monitor-egress-s3storage.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz \ - --output dotnet-monitor-egress-azureblobstorage.tar.gz.sha512 https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz.sha512 \ - --output dotnet-monitor-egress-s3storage.tar.gz.sha512 https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz.sha512 \ + --output dotnet-monitor-egress-azureblobstorage.tar.gz https://ci.dot.net/public/diagnostics/monitor/$dotnet_monitor_extension_version/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/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz \ + --output dotnet-monitor-egress-azureblobstorage.tar.gz.sha512 https://ci.dot.net/public-checksums/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz.sha512 \ + --output dotnet-monitor-egress-s3storage.tar.gz.sha512 https://ci.dot.net/public-checksums/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz.sha512 \ && echo "$(cat dotnet-monitor-egress-azureblobstorage.tar.gz.sha512) dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \ && echo "$(cat dotnet-monitor-egress-s3storage.tar.gz.sha512) dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \ && mkdir --parents /app \ @@ -29,6 +29,6 @@ RUN dotnet_monitor_extension_version=10.0.4 \ # .NET Monitor image -FROM $REPO:10.0.4-amd64 +FROM $REPO:10.0.4-preview.1-amd64 COPY --from=installer ["/app", "/app"] diff --git a/src/monitor/10.0/azurelinux-distroless/arm64v8/Dockerfile b/src/monitor/10.0/azurelinux-distroless/arm64v8/Dockerfile index 247921678b..c6ae9a3e05 100644 --- a/src/monitor/10.0/azurelinux-distroless/arm64v8/Dockerfile +++ b/src/monitor/10.0/azurelinux-distroless/arm64v8/Dockerfile @@ -10,12 +10,12 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve .NET Monitor extensions -RUN dotnet_monitor_extension_version=10.0.4 \ +RUN dotnet_monitor_extension_version=10.0.4-preview.1.26504.2 \ && curl --fail --show-error --location \ - --output dotnet-monitor-egress-azureblobstorage.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \ - --output dotnet-monitor-egress-s3storage.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \ - --output dotnet-monitor-egress-azureblobstorage.tar.gz.sha512 https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-arm64.tar.gz.sha512 \ - --output dotnet-monitor-egress-s3storage.tar.gz.sha512 https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-arm64.tar.gz.sha512 \ + --output dotnet-monitor-egress-azureblobstorage.tar.gz https://ci.dot.net/public/diagnostics/monitor/$dotnet_monitor_extension_version/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/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \ + --output dotnet-monitor-egress-azureblobstorage.tar.gz.sha512 https://ci.dot.net/public-checksums/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-arm64.tar.gz.sha512 \ + --output dotnet-monitor-egress-s3storage.tar.gz.sha512 https://ci.dot.net/public-checksums/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-arm64.tar.gz.sha512 \ && echo "$(cat dotnet-monitor-egress-azureblobstorage.tar.gz.sha512) dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \ && echo "$(cat dotnet-monitor-egress-s3storage.tar.gz.sha512) dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \ && mkdir --parents /app \ @@ -29,6 +29,6 @@ RUN dotnet_monitor_extension_version=10.0.4 \ # .NET Monitor image -FROM $REPO:10.0.4-arm64v8 +FROM $REPO:10.0.4-preview.1-arm64v8 COPY --from=installer ["/app", "/app"]