Skip to content
This repository was archived by the owner on Feb 2, 2026. It is now read-only.

Commit ee4d3ca

Browse files
skorubaskoruba
authored
Merge pull request #658 from skoruba/dev
1.0.0-RC2
2 parents 2038b79 + 14534be commit ee4d3ca

1,042 files changed

Lines changed: 47484 additions & 5813 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,3 +280,7 @@ __pycache__/
280280
!/src/Skoruba.IdentityServer4.Admin/Views/Log/
281281
!/src/Skoruba.IdentityServer4.Admin.BusinessLogic/Events/Log/
282282
/src/Skoruba.IdentityServer4.Admin.Api/appsettings.Production.json
283+
284+
appsettings.*.json
285+
286+
/shared/nginx/certs/

‎README.md‎

Lines changed: 95 additions & 19 deletions
Large diffs are not rendered by default.

‎Skoruba.IdentityServer4.Admin.sln‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "business", "business", "{EE
4747
EndProject
4848
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Skoruba.IdentityServer4.Admin.EntityFramework.MySql", "src\Skoruba.IdentityServer4.Admin.EntityFramework.MySql\Skoruba.IdentityServer4.Admin.EntityFramework.MySql.csproj", "{0A8A0DB7-0509-4DFB-9201-74398511B481}"
4949
EndProject
50-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Skoruba.IdentityServer4.Admin.Api.IntegrationTests", "tests\Skoruba.IdentityServer4.Admin.Api.IntegrationTests\Skoruba.IdentityServer4.Admin.Api.IntegrationTests.csproj", "{4D123ACB-ACBD-4E40-AE6B-1B0F79D703B0}"
50+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Skoruba.IdentityServer4.Admin.Api.IntegrationTests", "tests\Skoruba.IdentityServer4.Admin.Api.IntegrationTests\Skoruba.IdentityServer4.Admin.Api.IntegrationTests.csproj", "{4D123ACB-ACBD-4E40-AE6B-1B0F79D703B0}"
51+
EndProject
52+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Skoruba.IdentityServer4.Shared", "src\Skoruba.IdentityServer4.Shared\Skoruba.IdentityServer4.Shared.csproj", "{61B285F0-EE06-4AEE-AAF3-71492CBD11C5}"
5153
EndProject
5254
Global
5355
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -127,6 +129,10 @@ Global
127129
{4D123ACB-ACBD-4E40-AE6B-1B0F79D703B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
128130
{4D123ACB-ACBD-4E40-AE6B-1B0F79D703B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
129131
{4D123ACB-ACBD-4E40-AE6B-1B0F79D703B0}.Release|Any CPU.Build.0 = Release|Any CPU
132+
{61B285F0-EE06-4AEE-AAF3-71492CBD11C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
133+
{61B285F0-EE06-4AEE-AAF3-71492CBD11C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
134+
{61B285F0-EE06-4AEE-AAF3-71492CBD11C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
135+
{61B285F0-EE06-4AEE-AAF3-71492CBD11C5}.Release|Any CPU.Build.0 = Release|Any CPU
130136
EndGlobalSection
131137
GlobalSection(SolutionProperties) = preSolution
132138
HideSolutionNode = FALSE
@@ -149,6 +155,7 @@ Global
149155
{3ECDC91E-0D3E-4E4D-A34E-D33BB714578D} = {2A514C8F-6A53-41CA-AB41-B644E7BC92A7}
150156
{0A8A0DB7-0509-4DFB-9201-74398511B481} = {2A514C8F-6A53-41CA-AB41-B644E7BC92A7}
151157
{4D123ACB-ACBD-4E40-AE6B-1B0F79D703B0} = {0BC0CC4E-A0F1-45E8-B41A-AE0FA76BF3E5}
158+
{61B285F0-EE06-4AEE-AAF3-71492CBD11C5} = {EE588CE5-51D0-4E98-A2B3-40EC8E655931}
152159
EndGlobalSection
153160
GlobalSection(ExtensibilityGlobals) = postSolution
154161
SolutionGuid = {B3166EDE-037B-4C68-BEBA-5DE9C5E3DB82}

‎build/add-migrations.ps1‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ $targetContexts = @{
1212
IdentityServerConfigurationDbContext = "Migrations\IdentityServerConfiguration";
1313
IdentityServerPersistedGrantDbContext = "Migrations\IdentityServerGrants";
1414
AdminAuditLogDbContext = "Migrations\AuditLogging";
15+
IdentityServerDataProtectionDbContext = "Migrations\DataProtection";
1516
}
1617

1718
#Initialize the db providers and it's respective projects
@@ -24,7 +25,7 @@ $dpProviders = @{
2425
#Fix issue when the tools is not installed and the nuget package does not work see https://github.com/MicrosoftDocs/azure-docs/issues/40048
2526
Write-Host "Updating donet ef tools"
2627
$env:Path += " % USERPROFILE % \.dotnet\tools";
27-
dotnet tool update --global dotnet-ef --version 3.1.0
28+
dotnet tool update --global dotnet-ef
2829

2930
Write-Host "Start migrate projects"
3031
foreach ($provider in $dpProviders.Keys) {

‎build/create-nuget-packages.ps1‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
$packagesOutput = ".\packages"
2+
3+
dotnet pack .\..\src\Skoruba.IdentityServer4.Admin.BusinessLogic\Skoruba.IdentityServer4.Admin.BusinessLogic.csproj -c Release -o $packagesOutput
4+
dotnet pack .\..\src\Skoruba.IdentityServer4.Admin.BusinessLogic.Identity\Skoruba.IdentityServer4.Admin.BusinessLogic.Identity.csproj -c Release -o $packagesOutput
5+
dotnet pack .\..\src\Skoruba.IdentityServer4.Admin.BusinessLogic.Shared\Skoruba.IdentityServer4.Admin.BusinessLogic.Shared.csproj -c Release -o $packagesOutput
6+
7+
dotnet pack .\..\src\Skoruba.IdentityServer4.Admin.EntityFramework\Skoruba.IdentityServer4.Admin.EntityFramework.csproj -c Release -o $packagesOutput
8+
dotnet pack .\..\src\Skoruba.IdentityServer4.Admin.EntityFramework.Extensions\Skoruba.IdentityServer4.Admin.EntityFramework.Extensions.csproj -c Release -o $packagesOutput
9+
dotnet pack .\..\src\Skoruba.IdentityServer4.Admin.EntityFramework.Identity\Skoruba.IdentityServer4.Admin.EntityFramework.Identity.csproj -c Release -o $packagesOutput
10+
dotnet pack .\..\src\Skoruba.IdentityServer4.Admin.EntityFramework.Shared\Skoruba.IdentityServer4.Admin.EntityFramework.Shared.csproj -c Release -o $packagesOutput

‎build/publish-nuget-packages.ps1‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
param([string] $version, [string] $key)
2+
3+
dotnet nuget push ./packages/Skoruba.IdentityServer4.Admin.BusinessLogic.$version.nupkg -k $key -s https://api.nuget.org/v3/index.json
4+
dotnet nuget push ./packages/Skoruba.IdentityServer4.Admin.BusinessLogic.Identity.$version.nupkg -k $key -s https://api.nuget.org/v3/index.json
5+
dotnet nuget push ./packages/Skoruba.IdentityServer4.Admin.BusinessLogic.Shared.$version.nupkg -k $key -s https://api.nuget.org/v3/index.json
6+
7+
dotnet nuget push ./packages/Skoruba.IdentityServer4.Admin.EntityFramework.$version.nupkg -k $key -s https://api.nuget.org/v3/index.json
8+
dotnet nuget push ./packages/Skoruba.IdentityServer4.Admin.EntityFramework.Extensions.$version.nupkg -k $key -s https://api.nuget.org/v3/index.json
9+
dotnet nuget push ./packages/Skoruba.IdentityServer4.Admin.EntityFramework.Identity.$version.nupkg -k $key -s https://api.nuget.org/v3/index.json
10+
dotnet nuget push ./packages/Skoruba.IdentityServer4.Admin.EntityFramework.Shared.$version.nupkg -k $key -s https://api.nuget.org/v3/index.json

‎build/update-projects-version.ps1‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
param([string] $old, [string] $new)
2+
3+
$oldVersion = "<Version>$old</Version>"
4+
$newVersion = "<Version>$new</Version>"
5+
6+
$oldVersionNuspec = "<version>$old</version>"
7+
$newVersionNuspec = "<version>$new</version>"
8+
9+
$projectFiles = Get-ChildItem .\..\src -include *.csproj -Recurse
10+
foreach ($file in $projectFiles) {
11+
Write-Host $file.PSPath
12+
13+
(Get-Content $file.PSPath -raw -Encoding UTF8) |
14+
Foreach-Object { $_ -replace $oldVersion, $newVersion } |
15+
Set-Content $file.PSPath -Encoding UTF8
16+
}
17+
18+
$templateFiles = Get-ChildItem .\..\templates -include *.nuspec -Recurse
19+
foreach ($file in $templateFiles) {
20+
Write-Host $file.PSPath
21+
22+
(Get-Content $file.PSPath -raw -Encoding UTF8) |
23+
Foreach-Object { $_ -replace $oldVersionNuspec, $newVersionNuspec } |
24+
Set-Content $file.PSPath -Encoding UTF8
25+
}

‎docker-compose.dcproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
<None Include="docker-compose.override.yml">
1616
<DependentUpon>docker-compose.yml</DependentUpon>
1717
</None>
18+
<None Include="docker-compose.vs.release.yml">
19+
<DependentUpon>docker-compose.yml</DependentUpon>
20+
</None>
1821
<None Include="docker-compose.yml" />
1922
<None Include=".dockerignore" />
2023
</ItemGroup>

‎docker-compose.override.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,17 @@ services:
44
skoruba.identityserver4.admin:
55
environment:
66
- ASPNETCORE_ENVIRONMENT=Development
7-
ports:
8-
- "80"
97
volumes:
108
- ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:ro
9+
1110
skoruba.identityserver4.admin.api:
1211
environment:
1312
- ASPNETCORE_ENVIRONMENT=Development
14-
ports:
15-
- "80"
1613
volumes:
1714
- ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:ro
1815

1916
skoruba.identityserver4.sts.identity:
2017
environment:
2118
- ASPNETCORE_ENVIRONMENT=Development
22-
ports:
23-
- "80"
2419
volumes:
2520
- ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:ro

‎docker-compose.yml‎

Lines changed: 87 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,128 @@
11
version: '3.4'
2-
32
services:
4-
skoruba.identityserver4.admin:
5-
image: ${DOCKER_REGISTRY-}skoruba-identityserver4-admin
3+
nginx-proxy:
4+
image: jwilder/nginx-proxy
5+
container_name: nginx
66
ports:
7-
- 9000:80
7+
- '80:80'
8+
- '443:443'
9+
volumes:
10+
- '/var/run/docker.sock:/tmp/docker.sock:ro'
11+
- './shared/nginx/vhost.d:/etc/nginx/vhost.d'
12+
- './shared/nginx/certs:/etc/nginx/certs:ro'
13+
networks:
14+
proxy: null
15+
identityserverui:
16+
aliases:
17+
- sts.skoruba.local
18+
- admin.skoruba.local
19+
- admin-api.skoruba.local
20+
restart: always
21+
skoruba.identityserver4.admin:
22+
image: '${DOCKER_REGISTRY-}skoruba-identityserver4-admin'
823
build:
924
context: .
1025
dockerfile: src/Skoruba.IdentityServer4.Admin/Dockerfile
1126
container_name: skoruba-identityserver4-admin
1227
environment:
28+
- VIRTUAL_HOST=admin.skoruba.local
29+
- 'ConnectionStrings__ConfigurationDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true'
30+
- 'ConnectionStrings__PersistedGrantDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true'
31+
- 'ConnectionStrings__IdentityDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true'
32+
- 'ConnectionStrings__AdminLogDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true'
33+
- 'ConnectionStrings__AdminAuditLogDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true'
34+
- 'ConnectionStrings__DataProtectionDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true'
35+
- 'AdminConfiguration__IdentityAdminBaseUrl=https://admin.skoruba.local'
36+
- 'AdminConfiguration__IdentityAdminRedirectUri=https://admin.skoruba.local/signin-oidc'
37+
- 'AdminConfiguration__IdentityServerBaseUrl=https://sts.skoruba.local'
38+
- AdminConfiguration__RequireHttpsMetadata=false
39+
- 'IdentityServerData__Clients__0__ClientUri=https://admin.skoruba.local'
40+
- 'IdentityServerData__Clients__0__RedirectUris__0=https://admin.skoruba.local/signin-oidc'
41+
- 'IdentityServerData__Clients__0__FrontChannelLogoutUri=https://admin.skoruba.local/signin-oidc'
42+
- 'IdentityServerData__Clients__0__PostLogoutRedirectUris__0=https://admin.skoruba.local/signout-callback-oidc'
43+
- 'IdentityServerData__Clients__0__AllowedCorsOrigins__0=https://admin.skoruba.local'
44+
- 'IdentityServerData__Clients__1__RedirectUris__0=https://admin-api.skoruba.local/swagger/oauth2-redirect.html'
45+
- 'Serilog__WriteTo__1__Args__connectionString=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true'
46+
- DockerConfiguration__UpdateCaCertificate=true
1347
- ASPNETCORE_ENVIRONMENT=Development
14-
- "ConnectionStrings__ConfigurationDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true"
15-
- "ConnectionStrings__PersistedGrantDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true"
16-
- "ConnectionStrings__IdentityDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true"
17-
- "ConnectionStrings__AdminLogDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true"
18-
- "ConnectionStrings__AdminAuditLogDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true"
19-
- "AdminConfiguration__IdentityAdminBaseUrl=http://127.0.0.1.xip.io:9000"
20-
- "AdminConfiguration__IdentityAdminRedirectUri=http://127.0.0.1.xip.io:9000/signin-oidc"
21-
- "AdminConfiguration__IdentityServerBaseUrl=http://127.0.0.1.xip.io"
22-
- "AdminConfiguration__RequireHttpsMetadata=false"
23-
- "IdentityServerData__Clients__0__ClientUri=http://127.0.0.1.xip.io:9000"
24-
- "IdentityServerData__Clients__0__RedirectUris__0=http://127.0.0.1.xip.io:9000/signin-oidc"
25-
- "IdentityServerData__Clients__0__FrontChannelLogoutUri=http://127.0.0.1.xip.io:9000/signin-oidc"
26-
- "IdentityServerData__Clients__0__PostLogoutRedirectUris__0=http://127.0.0.1.xip.io:9000/signout-callback-oidc"
27-
- "IdentityServerData__Clients__0__AllowedCorsOrigins__0=http://127.0.0.1.xip.io:9000"
28-
- "IdentityServerData__Clients__1__RedirectUris__0=http://127.0.0.1.xip.io:5000/swagger/oauth2-redirect.html"
29-
- "Serilog__WriteTo__1__Args__connectionString=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true"
3048
command: dotnet Skoruba.IdentityServer4.Admin.dll /seed
3149
depends_on:
3250
- db
3351
- skoruba.identityserver4.sts.identity
3452
volumes:
35-
- "./shared/serilog.json:/app/serilog.json"
36-
- "./shared/identitydata.json:/app/identitydata.json"
37-
- "./shared/identityserverdata.json:/app/identityserverdata.json"
38-
53+
- './shared/serilog.json:/app/serilog.json'
54+
- './shared/identitydata.json:/app/identitydata.json'
55+
- './shared/identityserverdata.json:/app/identityserverdata.json'
56+
- './shared/nginx/certs/cacerts.crt:/usr/local/share/ca-certificates/cacerts.crt'
57+
networks:
58+
identityserverui: null
3959
skoruba.identityserver4.admin.api:
40-
image: ${DOCKER_REGISTRY-}skoruba-identityserver4-admin-api
60+
image: '${DOCKER_REGISTRY-}skoruba-identityserver4-admin-api'
4161
build:
4262
context: .
4363
dockerfile: src/Skoruba.IdentityServer4.Admin.Api/Dockerfile
44-
ports:
45-
- 5000:80
46-
environment:
47-
- "AdminApiConfiguration__RequireHttpsMetadata=false"
48-
- "AdminApiConfiguration__ApiBaseUrl=http://127.0.0.1.xip.io:5000"
49-
- "AdminApiConfiguration__IdentityServerBaseUrl=http://127.0.0.1.xip.io"
50-
- "ConnectionStrings__ConfigurationDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true"
51-
- "ConnectionStrings__PersistedGrantDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true"
52-
- "ConnectionStrings__IdentityDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true"
53-
- "ConnectionStrings__AdminLogDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true"
54-
- "ConnectionStrings__AdminAuditLogDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true"
5564
container_name: skoruba-identityserver4-admin-api
65+
environment:
66+
- VIRTUAL_HOST=admin-api.skoruba.local
67+
- AdminApiConfiguration__RequireHttpsMetadata=false
68+
- 'AdminApiConfiguration__ApiBaseUrl=https://admin-api.skoruba.local'
69+
- 'AdminApiConfiguration__IdentityServerBaseUrl=https://sts.skoruba.local'
70+
- 'ConnectionStrings__ConfigurationDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true'
71+
- 'ConnectionStrings__PersistedGrantDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true'
72+
- 'ConnectionStrings__IdentityDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true'
73+
- 'ConnectionStrings__AdminLogDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true'
74+
- 'ConnectionStrings__AdminAuditLogDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true'
75+
- 'ConnectionStrings__DataProtectionDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true'
76+
- DockerConfiguration__UpdateCaCertificate=true
77+
- ASPNETCORE_ENVIRONMENT=Development
5678
volumes:
57-
- "./shared/serilog.json:/app/serilog.json"
58-
79+
- './shared/serilog.json:/app/serilog.json'
80+
- './shared/nginx/certs/cacerts.crt:/usr/local/share/ca-certificates/cacerts.crt'
81+
networks:
82+
identityserverui: null
5983
skoruba.identityserver4.sts.identity:
60-
image: ${DOCKER_REGISTRY-}skoruba-identityserver4-sts-identity
61-
ports:
62-
- 80:80
84+
image: '${DOCKER_REGISTRY-}skoruba-identityserver4-sts-identity'
6385
build:
6486
context: .
6587
dockerfile: src/Skoruba.IdentityServer4.STS.Identity/Dockerfile
6688
container_name: skoruba-identityserver4-sts-identity
6789
environment:
90+
- VIRTUAL_HOST=sts.skoruba.local
91+
- 'ConnectionStrings__ConfigurationDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true'
92+
- 'ConnectionStrings__PersistedGrantDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true'
93+
- 'ConnectionStrings__IdentityDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true'
94+
- 'ConnectionStrings__DataProtectionDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true'
95+
- 'AdminConfiguration__IdentityAdminBaseUrl=https://admin.skoruba.local'
96+
- 'AdvancedConfiguration__PublicOrigin=https://sts.skoruba.local'
97+
- 'AdvancedConfiguration__IssuerUri=https://sts.skoruba.local'
98+
- DockerConfiguration__UpdateCaCertificate=true
6899
- ASPNETCORE_ENVIRONMENT=Development
69-
- "ConnectionStrings__ConfigurationDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true"
70-
- "ConnectionStrings__PersistedGrantDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true"
71-
- "ConnectionStrings__IdentityDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true"
72-
- "AdminConfiguration__IdentityAdminBaseUrl=http://127.0.0.1.xip.io:9000"
73100
depends_on:
74101
- db
75102
volumes:
76-
- "./shared/serilog.json:/app/serilog.json"
103+
- './shared/serilog.json:/app/serilog.json'
104+
- './shared/nginx/certs/cacerts.crt:/usr/local/share/ca-certificates/cacerts.crt'
77105
networks:
78-
default:
106+
identityserverui:
79107
aliases:
80-
- 127.0.0.1.xip.io
108+
- sts.skoruba.local
81109
db:
82-
image: "mcr.microsoft.com/mssql/server"
110+
image: 'mcr.microsoft.com/mssql/server:2017-CU20-ubuntu-16.04'
83111
ports:
84-
- 1433:1433
112+
- '7900:1433'
85113
container_name: skoruba-identityserver4-db
86114
environment:
87-
SA_PASSWORD: "${DB_PASSWORD:-Password_123}"
88-
ACCEPT_EULA: "Y"
115+
SA_PASSWORD: '${DB_PASSWORD:-Password_123}'
116+
ACCEPT_EULA: 'Y'
89117
volumes:
90-
- dbdata:/var/opt/mssql
91-
118+
- 'dbdata:/var/opt/mssql'
119+
networks:
120+
identityserverui: null
92121
volumes:
93122
dbdata:
94123
driver: local
95-
96124
networks:
97-
default:
98-
driver: bridge
125+
proxy:
126+
driver: bridge
127+
identityserverui:
128+
driver: bridge

0 commit comments

Comments
 (0)