Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nightly] Update dependencies from dotnet/dotnet-monitor/9.1 #6318

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.monitor-base.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Tags | Dockerfile | OS Version

Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.1.0-preview.1-amd64, 9.1-preview-amd64, 9.1.0-preview.1, 9.1-preview, 9-preview, latest | [Dockerfile](src/monitor-base/9.1/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0
9.1.0-preview.2-amd64, 9.1-preview-amd64, 9.1.0-preview.2, 9.1-preview, 9-preview, latest | [Dockerfile](src/monitor-base/9.1/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0

### Linux arm64 Tags

Expand All @@ -80,7 +80,7 @@ Tags | Dockerfile | OS Version

Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.1.0-preview.1-arm64v8, 9.1-preview-arm64v8, 9.1.0-preview.1, 9.1-preview, 9-preview, latest | [Dockerfile](src/monitor-base/9.1/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
9.1.0-preview.2-arm64v8, 9.1-preview-arm64v8, 9.1.0-preview.2, 9.1-preview, 9-preview, latest | [Dockerfile](src/monitor-base/9.1/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
<!--End of generated tags-->

*Tags not listed in the table above are not supported. See the [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md). See the [full list of tags](https://mcr.microsoft.com/v2/dotnet/nightly/monitor/base/tags/list) for all supported and unsupported tags.*
Expand Down
4 changes: 2 additions & 2 deletions README.monitor.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Tags | Dockerfile | OS Version

Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.1.0-preview.1, 9.1-preview, 9-preview, latest | [Dockerfile](src/monitor/9.1/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0
9.1.0-preview.2, 9.1-preview, 9-preview, latest | [Dockerfile](src/monitor/9.1/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0

### Linux arm64 Tags

Expand All @@ -79,7 +79,7 @@ Tags | Dockerfile | OS Version

Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.1.0-preview.1, 9.1-preview, 9-preview, latest | [Dockerfile](src/monitor/9.1/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
9.1.0-preview.2, 9.1-preview, 9-preview, latest | [Dockerfile](src/monitor/9.1/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
<!--End of generated tags-->

*Tags not listed in the table above are not supported. See the [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md). See the [full list of tags](https://mcr.microsoft.com/v2/dotnet/nightly/monitor/tags/list) for all supported and unsupported tags.*
Expand Down
16 changes: 8 additions & 8 deletions manifest.versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -181,18 +181,18 @@
"monitor-ext-s3storage|9.0|linux|x64|sha": "4dfc3b612b4b8389216e232144b61ff82a1e1da9a7414b2d21bf083ad38a980569f69c605919deeac8af05188254fcfc7651d3606845405d45af2d0f5a96b5bd",
"monitor-ext-s3storage|9.0|linux|arm64|sha": "06d9c1997b298c68132f5536a7b517e6c8422b9d09e75a90603b6c18abd7f851625ba8b162a761f6575fcb06b47e4ac11e55e7d494f744e1594638c7dcbb474c",

"monitor|9.1|build-version": "9.1.0-preview.1.25155.2",
"monitor|9.1|product-version": "9.1.0-preview.1",
"monitor|9.1|build-version": "9.1.0-preview.2.25164.1",
"monitor|9.1|product-version": "9.1.0-preview.2",
"monitor|9.1|fixed-tag": "$(monitor|9.1|product-version)",
"monitor|9.1|minor-tag": "9.1-preview",
"monitor|9.1|base-url|main": "$(base-url|public|maintenance|main)",
"monitor|9.1|base-url|nightly": "$(base-url|public|preview|nightly)",
"monitor-base|9.1|linux|x64|sha": "d819029bf3cb6b09af7d4a11a64ffc604ac06c94b2c7373fe1b60119a68480ff9201215da7ffd805099893ed7ef3b39f3d8fc63943cb239fb89c2bd0ea99dfe1",
"monitor-base|9.1|linux|arm64|sha": "7aa1c0b40012ce1eadc5da8d3e6f1f171dfffd3b46f907d15937030da25587f3986250578417dd17feafc6c4d670911a596255cc9933705acc6e1bcd5c99371e",
"monitor-ext-azureblobstorage|9.1|linux|x64|sha": "e7812160cdc164969fcdd734c28493fdcda35090196240dabcfe70f8cb0a6916d47cc6184886a857c5d07b5e69672cb858837d2fa0ceaf54372508559a6bc356",
"monitor-ext-azureblobstorage|9.1|linux|arm64|sha": "b2a4d674eee9f6c030910784edcf30a0ea226a53300196726b7a21335129e89ed6e41b54e817c02650e38e43cbe0235cbedcded45836864e97fe7a7af634c25c",
"monitor-ext-s3storage|9.1|linux|x64|sha": "fa32d3a3cb197078c2b431ecb151065063ed005db8857009ead44c9f436be83af042f328d72828ba7abe48a37f2c3f256fffb3c19c36671bb88e2df26741bcae",
"monitor-ext-s3storage|9.1|linux|arm64|sha": "b38f66ffb10ad7a9256af4cb0dbbf6de525b46d1b3c306c57aabcb6372abfc30d3226fe578c8292fb6ae49e2c6a2fa8b927ea54d6670ab205287f94c01ac4b49",
"monitor-base|9.1|linux|x64|sha": "7de2534ab271964e0d8bc2257dc0e43333d734860027d3c7deb3256bad67ec5f1e23d36ab39a0a10a707c88fd92ddba6b21490a5e267d793960572e36b0ec060",
"monitor-base|9.1|linux|arm64|sha": "7068f67b1f0afeddff8ca76bd1417c7f8461f27aadfaf5494561acb0d3a5c7801150e0a07c0198568f0526d52f2654b3e1c61f6fcb309dd2e55e3bf504d9a155",
"monitor-ext-azureblobstorage|9.1|linux|x64|sha": "30f83c1c5cc0510eb8c6f9ba27ea42727cec06055da9c14671d73e147b786b3b52dbe53dd34996731c2d41cd0304ea01a4b8383f1995d569ecee37a5ec1ac19d",
"monitor-ext-azureblobstorage|9.1|linux|arm64|sha": "91232a1f6294eb800f2b0fb51d85cd2c6bf50bb8202e754023c1cd522e71c0aa4ef3282722f2516e56c96346b67655bbd0c4584ca8a7d079585a7050a6246329",
"monitor-ext-s3storage|9.1|linux|x64|sha": "72c5f3ea129012efc7635d45747483978d0793e9ce87e3e8270b35d3a1a2b012da2ed481f35fd15be05d4e5113521444cbd6280630124c93e56244f24b07e569",
"monitor-ext-s3storage|9.1|linux|arm64|sha": "2b45fe335ed5f036bdab12ae0418e26160f142891bee52cb23682a7d018ded498e8e04e9558e07cfbcec285b90e3571608e9e7b2032704a79a032bb18f828be9",

"powershell|8.0|build-version": "7.4.7",
"powershell|8.0|Linux.Alpine|sha": "9c5fbb87edf9f1b3da05beeeacd69ae361cb60b0eb16079c26a5c6b477a17e4ed1deef31cdb23de43c959eae2a2731cf16188b491db2ad5d398276ca0e71faaf",
Expand Down
4 changes: 2 additions & 2 deletions src/monitor-base/9.1/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.1.0-preview.1.25155.2 \
RUN dotnet_monitor_version=9.1.0-preview.2.25164.1 \
&& curl -fSL --output dotnet-monitor-base.tar.gz https://ci.dot.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \
&& dotnet_monitor_base_sha512='d819029bf3cb6b09af7d4a11a64ffc604ac06c94b2c7373fe1b60119a68480ff9201215da7ffd805099893ed7ef3b39f3d8fc63943cb239fb89c2bd0ea99dfe1' \
&& dotnet_monitor_base_sha512='7de2534ab271964e0d8bc2257dc0e43333d734860027d3c7deb3256bad67ec5f1e23d36ab39a0a10a707c88fd92ddba6b21490a5e267d793960572e36b0ec060' \
&& 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
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.1.0-preview.1.25155.2 \
RUN dotnet_monitor_version=9.1.0-preview.2.25164.1 \
&& curl -fSL --output dotnet-monitor-base.tar.gz https://ci.dot.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \
&& dotnet_monitor_base_sha512='7aa1c0b40012ce1eadc5da8d3e6f1f171dfffd3b46f907d15937030da25587f3986250578417dd17feafc6c4d670911a596255cc9933705acc6e1bcd5c99371e' \
&& dotnet_monitor_base_sha512='7068f67b1f0afeddff8ca76bd1417c7f8461f27aadfaf5494561acb0d3a5c7801150e0a07c0198568f0526d52f2654b3e1c61f6fcb309dd2e55e3bf504d9a155' \
&& 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.1/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.1.0-preview.1.25155.2 \
RUN dotnet_monitor_extension_version=9.1.0-preview.2.25164.1 \
&& curl -fSL --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 \
&& dotnet_monitor_extension_sha512='e7812160cdc164969fcdd734c28493fdcda35090196240dabcfe70f8cb0a6916d47cc6184886a857c5d07b5e69672cb858837d2fa0ceaf54372508559a6bc356' \
&& dotnet_monitor_extension_sha512='30f83c1c5cc0510eb8c6f9ba27ea42727cec06055da9c14671d73e147b786b3b52dbe53dd34996731c2d41cd0304ea01a4b8383f1995d569ecee37a5ec1ac19d' \
&& echo "$dotnet_monitor_extension_sha512 dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \
\
&& curl -fSL --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 \
&& dotnet_monitor_extension_sha512='fa32d3a3cb197078c2b431ecb151065063ed005db8857009ead44c9f436be83af042f328d72828ba7abe48a37f2c3f256fffb3c19c36671bb88e2df26741bcae' \
&& dotnet_monitor_extension_sha512='72c5f3ea129012efc7635d45747483978d0793e9ce87e3e8270b35d3a1a2b012da2ed481f35fd15be05d4e5113521444cbd6280630124c93e56244f24b07e569' \
&& 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.1.0-preview.1.25155.2 \


# .NET Monitor image
FROM $REPO:9.1.0-preview.1-amd64
FROM $REPO:9.1.0-preview.2-amd64

COPY --from=installer ["/app", "/app"]
8 changes: 4 additions & 4 deletions src/monitor/9.1/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.1.0-preview.1.25155.2 \
RUN dotnet_monitor_extension_version=9.1.0-preview.2.25164.1 \
&& curl -fSL --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 \
&& dotnet_monitor_extension_sha512='b2a4d674eee9f6c030910784edcf30a0ea226a53300196726b7a21335129e89ed6e41b54e817c02650e38e43cbe0235cbedcded45836864e97fe7a7af634c25c' \
&& dotnet_monitor_extension_sha512='91232a1f6294eb800f2b0fb51d85cd2c6bf50bb8202e754023c1cd522e71c0aa4ef3282722f2516e56c96346b67655bbd0c4584ca8a7d079585a7050a6246329' \
&& echo "$dotnet_monitor_extension_sha512 dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \
\
&& curl -fSL --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 \
&& dotnet_monitor_extension_sha512='b38f66ffb10ad7a9256af4cb0dbbf6de525b46d1b3c306c57aabcb6372abfc30d3226fe578c8292fb6ae49e2c6a2fa8b927ea54d6670ab205287f94c01ac4b49' \
&& dotnet_monitor_extension_sha512='2b45fe335ed5f036bdab12ae0418e26160f142891bee52cb23682a7d018ded498e8e04e9558e07cfbcec285b90e3571608e9e7b2032704a79a032bb18f828be9' \
&& 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.1.0-preview.1.25155.2 \


# .NET Monitor image
FROM $REPO:9.1.0-preview.1-arm64v8
FROM $REPO:9.1.0-preview.2-arm64v8

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