Skip to content

Commit

Permalink
Update dotnet-monitor 9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
wiktork authored and lbussell committed Oct 7, 2024
1 parent d7a6841 commit 4c57e8b
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions README.monitor-base.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ The following Dockerfiles demonstrate how you can use this base image to build a

Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.0.0-rc.1-amd64, 9.0-amd64, 9.0.0-rc.1, 9.0, 9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0
9.0.0-rc.2-amd64, 9.0-amd64, 9.0.0-rc.2, 9.0, 9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0
8.0.4-ubuntu-chiseled-amd64, 8.0-ubuntu-chiseled-amd64, 8-ubuntu-chiseled-amd64, 8.0.4-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8-ubuntu-chiseled, 8.0.4, 8.0, 8, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor-base/8.0/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04
8.0.4-cbl-mariner-distroless-amd64, 8.0-cbl-mariner-distroless-amd64, 8-cbl-mariner-distroless-amd64, 8.0.4-cbl-mariner-distroless, 8.0-cbl-mariner-distroless, 8-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor-base/8.0/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0

### Linux arm64 Tags

Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.0.0-rc.1-arm64v8, 9.0-arm64v8, 9.0.0-rc.1, 9.0, 9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
9.0.0-rc.2-arm64v8, 9.0-arm64v8, 9.0.0-rc.2, 9.0, 9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
8.0.4-ubuntu-chiseled-arm64v8, 8.0-ubuntu-chiseled-arm64v8, 8-ubuntu-chiseled-arm64v8, 8.0.4-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8-ubuntu-chiseled, 8.0.4, 8.0, 8, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor-base/8.0/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
8.0.4-cbl-mariner-distroless-arm64v8, 8.0-cbl-mariner-distroless-arm64v8, 8-cbl-mariner-distroless-arm64v8, 8.0.4-cbl-mariner-distroless, 8.0-cbl-mariner-distroless, 8-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor-base/8.0/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0
<!--End of generated tags-->
Expand Down
4 changes: 2 additions & 2 deletions README.monitor.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ See the [documentation](https://go.microsoft.com/fwlink/?linkid=2158052) for how

Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.0.0-rc.1-amd64, 9.0-amd64, 9.0.0-rc.1, 9.0, 9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0
9.0.0-rc.2-amd64, 9.0-amd64, 9.0.0-rc.2, 9.0, 9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0
8.0.4-ubuntu-chiseled-amd64, 8.0-ubuntu-chiseled-amd64, 8-ubuntu-chiseled-amd64, 8.0.4-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8-ubuntu-chiseled, 8.0.4, 8.0, 8, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/8.0/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04
8.0.4-cbl-mariner-distroless-amd64, 8.0-cbl-mariner-distroless-amd64, 8-cbl-mariner-distroless-amd64, 8.0.4-cbl-mariner-distroless, 8.0-cbl-mariner-distroless, 8-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/8.0/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0
6.3.8-alpine-amd64, 6.3-alpine-amd64, 6-alpine-amd64, 6.3.8-alpine, 6.3-alpine, 6-alpine, 6.3.8, 6.3, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/alpine/amd64/Dockerfile) | Alpine 3.20
Expand All @@ -71,7 +71,7 @@ Tags | Dockerfile | OS Version

Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.0.0-rc.1-arm64v8, 9.0-arm64v8, 9.0.0-rc.1, 9.0, 9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
9.0.0-rc.2-arm64v8, 9.0-arm64v8, 9.0.0-rc.2, 9.0, 9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
8.0.4-ubuntu-chiseled-arm64v8, 8.0-ubuntu-chiseled-arm64v8, 8-ubuntu-chiseled-arm64v8, 8.0.4-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8-ubuntu-chiseled, 8.0.4, 8.0, 8, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/8.0/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
8.0.4-cbl-mariner-distroless-arm64v8, 8.0-cbl-mariner-distroless-arm64v8, 8-cbl-mariner-distroless-arm64v8, 8.0.4-cbl-mariner-distroless, 8.0-cbl-mariner-distroless, 8-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/8.0/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0
6.3.8-alpine-arm64v8, 6.3-alpine-arm64v8, 6-alpine-arm64v8, 6.3.8-alpine, 6.3-alpine, 6-alpine, 6.3.8, 6.3, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/alpine/arm64v8/Dockerfile) | Alpine 3.20
Expand Down
16 changes: 8 additions & 8 deletions manifest.versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,19 +151,19 @@
"monitor-ext-s3storage|8.0|linux|x64|sha": "e282162778e52a978a4c9a9859b321f1f99c930a1bdc6e7094dc47259fe70db5eb0ffb08bed2735d60608dc7349cc79005e35a5c4899f2a4d5632c68a8c914bd",
"monitor-ext-s3storage|8.0|linux|arm64|sha": "aafa848ae9022ffbcf29bff781b95747e59acd0a950b8b3d6ae9cc699365891e8b2e00c6d22d912ebac2308f8a61074e1b802c92db308bb6004d8e610d4d93df",

"monitor|9.0|build-version": "9.0.0-rc.1.24453.3",
"monitor|9.0|product-version": "9.0.0-rc.1",
"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|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|preview|nightly)",
"monitor-base|9.0|linux|x64|sha": "28b64b40ad4f7e884e9b7b415a9650f02ee666282052a684f76bae50bd45906af4233dc952595382be322495409f95ca3aad9757f083e3d28d7469b60b9373cd",
"monitor-base|9.0|linux|arm64|sha": "51f0a7d62900abc81bdde64ce12ef43acdd8edf0127141e5607c420671d8a614fc9c4ec6416b0659ab650726b9fb109b586b139d29740c43fcf68726e916feed",
"monitor-ext-azureblobstorage|9.0|linux|x64|sha": "2399a14fe0a84cee63292d7d524d3b1f71799318becc6526da22235e84d7762d4af54a9da2f1484b4f8500535ab59eca7725f6bf0857276a3472fc3500d11ab7",
"monitor-ext-azureblobstorage|9.0|linux|arm64|sha": "1396d228bdd492afd3b7819e52538c908b442a3398a7a2c1f06b159521336168479cf5af5da13ee84e514dcbc9c2e13c43cb333ebca6b05384f10b108fc1eb38",
"monitor-ext-s3storage|9.0|linux|x64|sha": "7c1c663a59ee953c16115814f7af848c6040c1b1ac03d026cd4c7c655376ecc3e9b7cf3853b63253d5c9ae182a135c8619b809feac5f591706c94afb49e6d3f7",
"monitor-ext-s3storage|9.0|linux|arm64|sha": "775a0db8773e3b76290b60ab3f5ff14d7eda104c0e343d8bb122c09099da524c711d40036bb209bcb88308d01089160d973395ca5229a4e3598f5a9b588a17ec",
"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",

"netstandard-targeting-pack-2.1.0|linux-rpm|x64|sha": "fab41a86b9182b276992795247868c093890c6b3d5739376374a302430229624944998e054de0ff99bddd9459fc9543636df1ebd5392db069ae953ac17ea2880",

Expand Down
4 changes: 2 additions & 2 deletions src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ RUN tdnf install -y \
&& tdnf clean all

# Retrieve .NET Monitor Base
RUN dotnet_monitor_version=9.0.0-rc.1.24453.3 \
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='28b64b40ad4f7e884e9b7b415a9650f02ee666282052a684f76bae50bd45906af4233dc952595382be322495409f95ca3aad9757f083e3d28d7469b60b9373cd' \
&& dotnet_monitor_base_sha512='ebb0b1cb0c3d88ba17787c895df6397e1781a1be274d6f874cb13ee67208f546b5d9b3f93a3c3cf6af43f497c6608a90ca4761cce6c6f431e351fd5c808819b4' \
&& echo "$dotnet_monitor_base_sha512 dotnet-monitor-base.tar.gz" | sha512sum -c - \
&& mkdir -p /app \
&& tar -oxzf dotnet-monitor-base.tar.gz -C /app \
Expand Down
4 changes: 2 additions & 2 deletions src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ RUN tdnf install -y \
&& tdnf clean all

# Retrieve .NET Monitor Base
RUN dotnet_monitor_version=9.0.0-rc.1.24453.3 \
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='51f0a7d62900abc81bdde64ce12ef43acdd8edf0127141e5607c420671d8a614fc9c4ec6416b0659ab650726b9fb109b586b139d29740c43fcf68726e916feed' \
&& dotnet_monitor_base_sha512='f30feb3e73db1abf90dcfa1c9ab990d842507f0f6d8f8001229f34fb2f7f804e157c37e9bd23299840ac74ad03134963c629f30579fb62581f20f97698ca6fb9' \
&& echo "$dotnet_monitor_base_sha512 dotnet-monitor-base.tar.gz" | sha512sum -c - \
&& mkdir -p /app \
&& tar -oxzf dotnet-monitor-base.tar.gz -C /app \
Expand Down
8 changes: 4 additions & 4 deletions src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ RUN tdnf install -y \
&& tdnf clean all

# Retrieve .NET Monitor extensions
RUN dotnet_monitor_extension_version=9.0.0-rc.1.24453.3 \
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='2399a14fe0a84cee63292d7d524d3b1f71799318becc6526da22235e84d7762d4af54a9da2f1484b4f8500535ab59eca7725f6bf0857276a3472fc3500d11ab7' \
&& dotnet_monitor_extension_sha512='03b535a031686637ea10d792b79014b5d32e0327e704d8eb5f2a308534cdfb47e7f1c506ad7d4e3322b6ffd7b3386d3838f399b590e548293c5e4d55a191fe88' \
&& 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='7c1c663a59ee953c16115814f7af848c6040c1b1ac03d026cd4c7c655376ecc3e9b7cf3853b63253d5c9ae182a135c8619b809feac5f591706c94afb49e6d3f7' \
&& dotnet_monitor_extension_sha512='2d4f745635683ee53b01b09cf39eabf9b16190145da9ba1adb930f066761b8791ef8b65aa6e94aa8a0cfc1997c9da2f7e0a05c3ea0e3ab81b01eb6dc6c068345' \
&& echo "$dotnet_monitor_extension_sha512 dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \
\
&& mkdir -p /app \
Expand All @@ -27,6 +27,6 @@ RUN dotnet_monitor_extension_version=9.0.0-rc.1.24453.3 \


# .NET Monitor image
FROM $REPO:9.0.0-rc.1-amd64
FROM $REPO:9.0.0-rc.2-amd64

COPY --from=installer ["/app", "/app"]
8 changes: 4 additions & 4 deletions src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ RUN tdnf install -y \
&& tdnf clean all

# Retrieve .NET Monitor extensions
RUN dotnet_monitor_extension_version=9.0.0-rc.1.24453.3 \
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='1396d228bdd492afd3b7819e52538c908b442a3398a7a2c1f06b159521336168479cf5af5da13ee84e514dcbc9c2e13c43cb333ebca6b05384f10b108fc1eb38' \
&& dotnet_monitor_extension_sha512='0b035ef3e8d3462814f5cc89821d5e0b44a072f880369d032dbd406194cfc929776a9434c678019d3089acf23f27b4626c9e42f706c132b4da5e4e4e4ebc4977' \
&& 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='775a0db8773e3b76290b60ab3f5ff14d7eda104c0e343d8bb122c09099da524c711d40036bb209bcb88308d01089160d973395ca5229a4e3598f5a9b588a17ec' \
&& dotnet_monitor_extension_sha512='900ee19ba16437b29702bf4380e2d5cfd4a478e4d8bea8286f92e768258a6030ba57846ec00ec52b6b35b9462559122595c7725498472c9f11622eac9f253e96' \
&& echo "$dotnet_monitor_extension_sha512 dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \
\
&& mkdir -p /app \
Expand All @@ -27,6 +27,6 @@ RUN dotnet_monitor_extension_version=9.0.0-rc.1.24453.3 \


# .NET Monitor image
FROM $REPO:9.0.0-rc.1-arm64v8
FROM $REPO:9.0.0-rc.2-arm64v8

COPY --from=installer ["/app", "/app"]

0 comments on commit 4c57e8b

Please sign in to comment.