Skip to content

Commit

Permalink
Update dotnet SDK to 6.0.102 (#1345)
Browse files Browse the repository at this point in the history
- Update .NET SDK to 6.0.102
- Update ASP.NET Core runtime to 6.0.2
  • Loading branch information
wsugarman authored Feb 9, 2022
1 parent 9802ff1 commit 8cb45f4
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions converter/dicom-cast/build/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Start from the sdk image
FROM mcr.microsoft.com/dotnet/sdk:6.0.101-alpine3.14@sha256:26b148be9e01d12985108fc3e02fbfd30e502baff4174755d2ce0dcbf22503f7 AS build
FROM mcr.microsoft.com/dotnet/sdk:6.0.102-alpine3.14@sha256:8d15f73dcd72485cc89e59cf0fa2e97ef016c4500164dd26b71cea6d532b8134 AS build

# Set the working directory to where the source is located
WORKDIR /dicom-cast/src
Expand All @@ -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.1-alpine3.14@sha256:daafe40427581dc44b6bfde1d71b1fad3d83b00f406285c3624133b59c469ab9 AS runtime
FROM mcr.microsoft.com/dotnet/aspnet:6.0.2-alpine3.14@sha256:7f9385ad945d06b35bc93b3d91a2be3e65a921ff0c872f6982b01b27088c4149 AS runtime

RUN set -x && \
addgroup nonroot && \
Expand Down
2 changes: 1 addition & 1 deletion docker/functions/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.101-alpine3.14@sha256:26b148be9e01d12985108fc3e02fbfd30e502baff4174755d2ce0dcbf22503f7 AS build
FROM mcr.microsoft.com/dotnet/sdk:6.0.102-alpine3.14@sha256:8d15f73dcd72485cc89e59cf0fa2e97ef016c4500164dd26b71cea6d532b8134 AS build
ARG BUILD_CONFIGURATION=Release
WORKDIR /dicom-server
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "6.0.101"
"version": "6.0.102"
}
}
2 changes: 1 addition & 1 deletion release/templates/featuresenabled-azuredeploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
"[resourceId('Microsoft.Web/sites/config', variables('featuresEnabledServiceName'), 'appsettings')]" // Avoid restarts mid-installation
],
"properties": {
"version": "6.0.1"
"version": "6.0.2"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion samples/templates/default-azuredeploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@
"[resourceId('Microsoft.Web/sites/config', variables('serviceName'), 'appsettings')]" // Avoid restarts mid-installation
],
"properties": {
"version": "6.0.1"
"version": "6.0.2"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Health.Dicom.Web/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.1-alpine3.14@sha256:daafe40427581dc44b6bfde1d71b1fad3d83b00f406285c3624133b59c469ab9 AS runtime
FROM mcr.microsoft.com/dotnet/aspnet:6.0.2-alpine3.14@sha256:7f9385ad945d06b35bc93b3d91a2be3e65a921ff0c872f6982b01b27088c4149 AS runtime
RUN set -x && \
# See https://www.abhith.net/blog/docker-sql-error-on-aspnet-core-alpine/
apk add --no-cache icu-libs && \
Expand All @@ -13,7 +13,7 @@ EXPOSE 8080
USER nonroot

# Copy the DICOM Server project and build it
FROM mcr.microsoft.com/dotnet/sdk:6.0.101-alpine3.14@sha256:26b148be9e01d12985108fc3e02fbfd30e502baff4174755d2ce0dcbf22503f7 AS build
FROM mcr.microsoft.com/dotnet/sdk:6.0.102-alpine3.14@sha256:8d15f73dcd72485cc89e59cf0fa2e97ef016c4500164dd26b71cea6d532b8134 AS build
ARG BUILD_CONFIGURATION=Release
ARG CONTINUOUS_INTEGRATION_BUILD=false
WORKDIR /dicom-server
Expand Down
2 changes: 1 addition & 1 deletion tools/scale-testing/templates/default-azuredeploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
"[variables('appServiceResourceId')]"
],
"properties": {
"version": "6.0.1"
"version": "6.0.2"
}
}
]
Expand Down

0 comments on commit 8cb45f4

Please sign in to comment.