From 6aa19cc63b9dfccc3090bd00a2ae7bb6cba73afd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Dec 2021 12:45:41 -0800 Subject: [PATCH] Update .NET SDK to 6.0.101 and ASP.NET Core Runtime to 6.0.1 (#1241) * Bump dotnet/sdk in /docker/functions Bumps dotnet/sdk from 6.0.100-alpine3.14 to 6.0.101-alpine3.14. --- updated-dependencies: - dependency-name: dotnet/sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update .NET SDK Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Will Sugarman --- converter/dicom-cast/build/docker/Dockerfile | 4 ++-- docker/functions/Dockerfile | 2 +- global.json | 2 +- release/templates/featuresenabled-azuredeploy.json | 2 +- samples/templates/default-azuredeploy.json | 2 +- src/Microsoft.Health.Dicom.Web/Dockerfile | 4 ++-- tools/scale-testing/templates/default-azuredeploy.json | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/converter/dicom-cast/build/docker/Dockerfile b/converter/dicom-cast/build/docker/Dockerfile index 70bdb1175b..b69a9dbcf2 100644 --- a/converter/dicom-cast/build/docker/Dockerfile +++ b/converter/dicom-cast/build/docker/Dockerfile @@ -1,5 +1,5 @@ # Start from the sdk image -FROM mcr.microsoft.com/dotnet/sdk:6.0.100-alpine3.14@sha256:1d9d66775f0d67cb68af9c7a083d22b576ea96f3f7a6893660d48f536b73e59f AS build +FROM mcr.microsoft.com/dotnet/sdk:6.0.101-alpine3.14@sha256:26b148be9e01d12985108fc3e02fbfd30e502baff4174755d2ce0dcbf22503f7 AS build # Set the working directory to where the source is located WORKDIR /dicom-cast/src @@ -12,7 +12,7 @@ RUN dotnet build "./converter/dicom-cast/src/Microsoft.Health.DicomCast.Hosting/ RUN dotnet publish "./converter/dicom-cast/src/Microsoft.Health.DicomCast.Hosting/Microsoft.Health.DicomCast.Hosting.csproj" -c Release -o "/.build" --no-build # Build the runtime image -FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-alpine3.14@sha256:1c893087b6d9cfe54d025dfeeda385358e79dcedd9a16f6ccdc9e5aa080db0f6 AS runtime +FROM mcr.microsoft.com/dotnet/aspnet:6.0.1-alpine3.14@sha256:daafe40427581dc44b6bfde1d71b1fad3d83b00f406285c3624133b59c469ab9 AS runtime RUN set -x && \ addgroup nonroot && \ diff --git a/docker/functions/Dockerfile b/docker/functions/Dockerfile index 4c9bb3e086..063815bbcb 100644 --- a/docker/functions/Dockerfile +++ b/docker/functions/Dockerfile @@ -13,7 +13,7 @@ RUN chown -R nonroot:nonroot /azure-functions-host USER nonroot # Copy the DICOM Server repository and build the Azure Functions project -FROM mcr.microsoft.com/dotnet/sdk:6.0.100-alpine3.14@sha256:1d9d66775f0d67cb68af9c7a083d22b576ea96f3f7a6893660d48f536b73e59f AS build +FROM mcr.microsoft.com/dotnet/sdk:6.0.101-alpine3.14@sha256:26b148be9e01d12985108fc3e02fbfd30e502baff4174755d2ce0dcbf22503f7 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /dicom-server COPY . . diff --git a/global.json b/global.json index 047020849f..e52d340bc6 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.100" + "version": "6.0.101" } } diff --git a/release/templates/featuresenabled-azuredeploy.json b/release/templates/featuresenabled-azuredeploy.json index 045c172589..78a44c8f69 100644 --- a/release/templates/featuresenabled-azuredeploy.json +++ b/release/templates/featuresenabled-azuredeploy.json @@ -124,7 +124,7 @@ "[resourceId('Microsoft.Web/sites/config', variables('featuresEnabledServiceName'), 'appsettings')]" // Avoid restarts mid-installation ], "properties": { - "version": "6.0.0" + "version": "6.0.1" } } ] diff --git a/samples/templates/default-azuredeploy.json b/samples/templates/default-azuredeploy.json index 788e151853..d5ed1305b0 100644 --- a/samples/templates/default-azuredeploy.json +++ b/samples/templates/default-azuredeploy.json @@ -283,7 +283,7 @@ "[resourceId('Microsoft.Web/sites/config', variables('serviceName'), 'appsettings')]" // Avoid restarts mid-installation ], "properties": { - "version": "6.0.0" + "version": "6.0.1" } }, { diff --git a/src/Microsoft.Health.Dicom.Web/Dockerfile b/src/Microsoft.Health.Dicom.Web/Dockerfile index 4f581fa851..6060ff975d 100644 --- a/src/Microsoft.Health.Dicom.Web/Dockerfile +++ b/src/Microsoft.Health.Dicom.Web/Dockerfile @@ -1,7 +1,7 @@ # See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. # Define the "runtime" image which will run the DICOM Server -FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-alpine3.14@sha256:1c893087b6d9cfe54d025dfeeda385358e79dcedd9a16f6ccdc9e5aa080db0f6 AS runtime +FROM mcr.microsoft.com/dotnet/aspnet:6.0.1-alpine3.14@sha256:daafe40427581dc44b6bfde1d71b1fad3d83b00f406285c3624133b59c469ab9 AS runtime RUN set -x && \ # See https://www.abhith.net/blog/docker-sql-error-on-aspnet-core-alpine/ apk add --no-cache icu-libs && \ @@ -13,7 +13,7 @@ EXPOSE 8080 USER nonroot # Copy the DICOM Server project and build it -FROM mcr.microsoft.com/dotnet/sdk:6.0.100-alpine3.14@sha256:1d9d66775f0d67cb68af9c7a083d22b576ea96f3f7a6893660d48f536b73e59f AS build +FROM mcr.microsoft.com/dotnet/sdk:6.0.101-alpine3.14@sha256:26b148be9e01d12985108fc3e02fbfd30e502baff4174755d2ce0dcbf22503f7 AS build ARG BUILD_CONFIGURATION=Release ARG CONTINUOUS_INTEGRATION_BUILD=false WORKDIR /dicom-server diff --git a/tools/scale-testing/templates/default-azuredeploy.json b/tools/scale-testing/templates/default-azuredeploy.json index 997c073302..c2ce28df60 100644 --- a/tools/scale-testing/templates/default-azuredeploy.json +++ b/tools/scale-testing/templates/default-azuredeploy.json @@ -135,7 +135,7 @@ "[variables('appServiceResourceId')]" ], "properties": { - "version": "6.0.0" + "version": "6.0.1" } } ]