Skip to content

Commit 310afcd

Browse files
Revert "feat: updated dockerfile resolving warnings and switching to dotnet9.…"
1 parent 8b4e054 commit 310afcd

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

Rsk.Samples.IdentityServer.AdminUIIntegration.Tests/AdminUIIntegration.Tests.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<PackageReference Include="FluentAssertions" Version="7.1.0" />
99
<PackageReference Include="IdentityModel.AspNetCore.OAuth2Introspection" Version="6.2.0" />
10-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.1" />
10+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.12" />
1111
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1212
<PackageReference Include="Moq" Version="4.20.72" />
1313
<PackageReference Include="xunit" Version="2.9.3" />

Rsk.Samples.IdentityServer.AdminUiIntegration/Dockerfile

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Stage 1 - Build
2-
FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build
2+
FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
33
WORKDIR /app
44

55
# packages installed
6-
#RUN apk update && \
7-
# apk upgrade
6+
RUN apk update && \
7+
apk upgrade
88

99
# Copy csproj and restore as distinct layers
1010
COPY *.csproj .
@@ -15,17 +15,17 @@ COPY . .
1515
RUN dotnet publish -c Release -o out
1616

1717
# Stage 2 - Runtime
18-
FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS runtime
18+
FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS runtime
1919

2020
# Ensuring latest openssl is installed as the one in base
2121
# is out of date and vulnerable
22-
#RUN apk update && \
23-
# apk upgrade && \
24-
# apk upgrade openssl
22+
RUN apk update && \
23+
apk upgrade && \
24+
apk upgrade openssl
2525

26-
ENV ASPNETCORE_ENVIRONMENT=Production
26+
ENV ASPNETCORE_ENVIRONMENT Production
2727
ENV ASPNETCORE_HTTP_PORT=5003
28-
ENV ASPNETCORE_URLS=http://*:5003
28+
ENV ASPNETCORE_URLS http://*:5003
2929
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
3030

3131
EXPOSE 5003

Rsk.Samples.IdentityServer.AdminUiIntegration/Rsk.Samples.IdentityServer.AdminUiIntegration.csproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<RootNamespace>Rsk.Samples.IdentityServer.AdminUiIntegration</RootNamespace>
55
</PropertyGroup>
66
<ItemGroup>
@@ -20,13 +20,13 @@
2020

2121
<ItemGroup>
2222
<!-- Framework Specific Packages -->
23-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.1" />
24-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.1" />
25-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.1" />
26-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.3" />
27-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.1" />
28-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0-preview.2.efcore.9.0.0" />
29-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.1" />
23+
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.12" />
24+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.12" />
25+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.12" />
26+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
27+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.12" />
28+
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
29+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.12" />
3030

3131
<!-- Framework Agnostic Packages -->
3232
<PackageReference Include="Duende.BFF" Version="2.3.0" />

0 commit comments

Comments
 (0)