Added host resolution fix to build steps
Added verbosity flags on each restore command
This commit is contained in:
+16
-13
@@ -6,22 +6,23 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: src/LiteCharmsSecurity.Admin/Dockerfile
|
dockerfile: src/LiteCharmsSecurity.Admin/Dockerfile
|
||||||
|
network: host
|
||||||
container_name: litecharms-security-admin
|
container_name: litecharms-security-admin
|
||||||
ports:
|
ports:
|
||||||
- "8081:8080" # Point your tunnel to this host port for admin.security.khongisa.co.za
|
- "8081:8080"
|
||||||
environment:
|
environment:
|
||||||
- ASPNETCORE_ENVIRONMENT=Production
|
- ASPNETCORE_ENVIRONMENT=Production
|
||||||
- ForwardedHeadersConfiguration__Enabled=true
|
- ForwardedHeadersConfiguration__Enabled=true
|
||||||
- ForwardedHeadersConfiguration__AllowAll=true
|
- ForwardedHeadersConfiguration__AllowAll=true
|
||||||
- ForwardedHeadersConfiguration__ForwardLimit=1
|
- ForwardedHeadersConfiguration__ForwardLimit=1
|
||||||
|
|
||||||
# URL Configurations
|
# URL Configurations
|
||||||
- AdminConfiguration__AuthenticationConfiguration__Authority=https://sts.security.khongisa.co.za
|
- AdminConfiguration__AuthenticationConfiguration__Authority=https://sts.security.khongisa.co.za
|
||||||
- AdminConfiguration__ApiConfiguration__ApiRemoteConfiguration__RemoteUrl=https://api.security.khongisa.co.za
|
- AdminConfiguration__ApiConfiguration__ApiRemoteConfiguration__RemoteUrl=https://api.security.khongisa.co.za
|
||||||
- AdminConfiguration__BasicConfiguration__Title=Lite Charms Security
|
- AdminConfiguration__BasicConfiguration__Title=Lite Charms Security
|
||||||
- AdminConfiguration__BasicConfiguration__BasePath=/
|
- AdminConfiguration__BasicConfiguration__BasePath=/
|
||||||
|
|
||||||
# Postgres Database Overrides
|
# Postgres Database Overrides
|
||||||
- ConnectionStrings__DataProtectionDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};application_name=litecharms_security_admin_dp;
|
- ConnectionStrings__DataProtectionDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};application_name=litecharms_security_admin_dp;
|
||||||
|
|
||||||
litecharmssecurity.admin.api:
|
litecharmssecurity.admin.api:
|
||||||
@@ -29,22 +30,23 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: src/LiteCharmsSecurity.Admin.Api/Dockerfile
|
dockerfile: src/LiteCharmsSecurity.Admin.Api/Dockerfile
|
||||||
|
network: host
|
||||||
container_name: litecharms-security-admin-api
|
container_name: litecharms-security-admin-api
|
||||||
ports:
|
ports:
|
||||||
- "8082:8080" # Point your tunnel to this host port for api.security.khongisa.co.za
|
- "8082:8080"
|
||||||
environment:
|
environment:
|
||||||
- ASPNETCORE_ENVIRONMENT=Production
|
- ASPNETCORE_ENVIRONMENT=Production
|
||||||
- ForwardedHeadersConfiguration__Enabled=true
|
- ForwardedHeadersConfiguration__Enabled=true
|
||||||
- ForwardedHeadersConfiguration__AllowAll=true
|
- ForwardedHeadersConfiguration__AllowAll=true
|
||||||
- ForwardedHeadersConfiguration__ForwardLimit=1
|
- ForwardedHeadersConfiguration__ForwardLimit=1
|
||||||
|
|
||||||
# API Configurations
|
# API Configurations
|
||||||
- AdminApiConfiguration__RequireHttpsMetadata=true
|
- AdminApiConfiguration__RequireHttpsMetadata=true
|
||||||
- AdminApiConfiguration__ApplicationName=Lite Charms Security UI
|
- AdminApiConfiguration__ApplicationName=Lite Charms Security UI
|
||||||
- AdminApiConfiguration__ApiBaseUrl=https://api.security.khongisa.co.za
|
- AdminApiConfiguration__ApiBaseUrl=https://api.security.khongisa.co.za
|
||||||
- AdminApiConfiguration__IdentityServerBaseUrl=https://sts.security.khongisa.co.za
|
- AdminApiConfiguration__IdentityServerBaseUrl=https://sts.security.khongisa.co.za
|
||||||
|
|
||||||
# Postgres Database Overrides
|
# Postgres Database Overrides
|
||||||
- ConnectionStrings__ConfigurationDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};application_name=litecharms_security_config;
|
- ConnectionStrings__ConfigurationDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};application_name=litecharms_security_config;
|
||||||
- ConnectionStrings__PersistedGrantDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};application_name=litecharms_security_grant;
|
- ConnectionStrings__PersistedGrantDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};application_name=litecharms_security_grant;
|
||||||
- ConnectionStrings__IdentityDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};application_name=litecharms_security_identity;
|
- ConnectionStrings__IdentityDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};application_name=litecharms_security_identity;
|
||||||
@@ -53,16 +55,16 @@ services:
|
|||||||
- ConnectionStrings__AdminConfigurationDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};application_name=litecharms_security_admin_config;
|
- ConnectionStrings__AdminConfigurationDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};application_name=litecharms_security_admin_config;
|
||||||
- ConnectionStrings__DataProtectionDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};application_name=litecharms_security_api_dp;
|
- ConnectionStrings__DataProtectionDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};application_name=litecharms_security_api_dp;
|
||||||
|
|
||||||
# Operational Management Switches (Controlled via Dockhand UI variables)
|
# Operational Management Switches (Controlled via Dockhand UI variables)
|
||||||
- SeedConfiguration__ApplySeed=${APPLY_SEED:-true}
|
- SeedConfiguration__ApplySeed=${APPLY_SEED:-true}
|
||||||
- DatabaseMigrationsConfiguration__ApplyDatabaseMigrations=${APPLY_MIGRATIONS:-true}
|
- DatabaseMigrationsConfiguration__ApplyDatabaseMigrations=${APPLY_MIGRATIONS:-true}
|
||||||
|
|
||||||
# SMTP Email Configuration Overrides
|
# SMTP Email Configuration Overrides
|
||||||
- SmtpConfiguration__Host=${SMTP_HOST:-mail.litecharms.co.za}
|
- SmtpConfiguration__Host=${SMTP_HOST:-mail.litecharms.co.za}
|
||||||
- SmtpConfiguration__Login=${SMTP_LOGIN:-security@litecharms.co.za}
|
- SmtpConfiguration__Login=${SMTP_LOGIN:-security@litecharms.co.za}
|
||||||
- SmtpConfiguration__Password=${SMTP_PASSWORD}
|
- SmtpConfiguration__Password=${SMTP_PASSWORD}
|
||||||
|
|
||||||
# Initial Seeding Domain Configurations
|
# Initial Seeding Domain Configurations
|
||||||
- IdentityServerData__Clients__0__ClientUri=https://admin.security.khongisa.co.za
|
- IdentityServerData__Clients__0__ClientUri=https://admin.security.khongisa.co.za
|
||||||
- IdentityServerData__Clients__0__RedirectUris__0=https://admin.security.khongisa.co.za/signin-oidc
|
- IdentityServerData__Clients__0__RedirectUris__0=https://admin.security.khongisa.co.za/signin-oidc
|
||||||
- IdentityServerData__Clients__0__FrontChannelLogoutUri=https://admin.security.khongisa.co.za/signout-oidc
|
- IdentityServerData__Clients__0__FrontChannelLogoutUri=https://admin.security.khongisa.co.za/signout-oidc
|
||||||
@@ -75,26 +77,27 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: src/LiteCharmsSecurity.STS.Identity/Dockerfile
|
dockerfile: src/LiteCharmsSecurity.STS.Identity/Dockerfile
|
||||||
|
network: host
|
||||||
container_name: litecharms-security-sts-identity
|
container_name: litecharms-security-sts-identity
|
||||||
ports:
|
ports:
|
||||||
- "8083:8080" # Point your tunnel to this host port for sts.security.khongisa.co.za
|
- "8083:8080"
|
||||||
environment:
|
environment:
|
||||||
- ASPNETCORE_ENVIRONMENT=Production
|
- ASPNETCORE_ENVIRONMENT=Production
|
||||||
- ForwardedHeadersConfiguration__Enabled=true
|
- ForwardedHeadersConfiguration__Enabled=true
|
||||||
- ForwardedHeadersConfiguration__AllowAll=true
|
- ForwardedHeadersConfiguration__AllowAll=true
|
||||||
- ForwardedHeadersConfiguration__ForwardLimit=1
|
- ForwardedHeadersConfiguration__ForwardLimit=1
|
||||||
|
|
||||||
# Identity Server Configs
|
# Identity Server Configs
|
||||||
- AdminConfiguration__IdentityAdminBaseUrl=https://admin.security.khongisa.co.za
|
- AdminConfiguration__IdentityAdminBaseUrl=https://admin.security.khongisa.co.za
|
||||||
- IdentityServerOptions__IssuerUri=https://sts.security.khongisa.co.za
|
- IdentityServerOptions__IssuerUri=https://sts.security.khongisa.co.za
|
||||||
- IdentityServerOptions__KeyManagement__Enabled=true
|
- IdentityServerOptions__KeyManagement__Enabled=true
|
||||||
|
|
||||||
# SMTP Email Configuration Overrides (For User Registration/Forgot Password workflows)
|
# SMTP Email Configuration Overrides (For User Registration/Forgot Password workflows)
|
||||||
- SmtpConfiguration__Host=${SMTP_HOST:-mail.litecharms.co.za}
|
- SmtpConfiguration__Host=${SMTP_HOST:-mail.litecharms.co.za}
|
||||||
- SmtpConfiguration__Login=${SMTP_LOGIN:-security@litecharms.co.za}
|
- SmtpConfiguration__Login=${SMTP_LOGIN:-security@litecharms.co.za}
|
||||||
- SmtpConfiguration__Password=${SMTP_PASSWORD}
|
- SmtpConfiguration__Password=${SMTP_PASSWORD}
|
||||||
|
|
||||||
# Postgres Database Overrides
|
# Postgres Database Overrides
|
||||||
- ConnectionStrings__ConfigurationDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};application_name=litecharms_security_sts_config;
|
- ConnectionStrings__ConfigurationDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};application_name=litecharms_security_sts_config;
|
||||||
- ConnectionStrings__PersistedGrantDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};application_name=litecharms_security_sts_grant;
|
- ConnectionStrings__PersistedGrantDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};application_name=litecharms_security_sts_grant;
|
||||||
- ConnectionStrings__IdentityDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};application_name=litecharms_security_sts_identity;
|
- ConnectionStrings__IdentityDbConnection=Server=192.168.1.170;Port=5432;Database=skoruba;User Id=skoruba;Password=${DB_PASSWORD};application_name=litecharms_security_sts_identity;
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ COPY ["src/LiteCharmsSecurity.Admin.EntityFramework.SqlServer/LiteCharmsSecurity
|
|||||||
COPY ["src/LiteCharmsSecurity.Shared/LiteCharmsSecurity.Shared.csproj", "src/LiteCharmsSecurity.Shared/"]
|
COPY ["src/LiteCharmsSecurity.Shared/LiteCharmsSecurity.Shared.csproj", "src/LiteCharmsSecurity.Shared/"]
|
||||||
COPY ["src/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL.csproj", "src/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL/"]
|
COPY ["src/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL.csproj", "src/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL/"]
|
||||||
|
|
||||||
RUN dotnet restore "src/LiteCharmsSecurity.Admin.Api/LiteCharmsSecurity.Admin.Api.csproj" --source "https://nexus.khongisa.co.za/repository/nuget-group/index.json"
|
RUN dotnet restore "src/LiteCharmsSecurity.Admin.Api/LiteCharmsSecurity.Admin.Api.csproj" --source "https://nexus.khongisa.co.za/repository/nuget-group/index.json" --verbosity detailed
|
||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
WORKDIR "src/LiteCharmsSecurity.Admin.Api"
|
WORKDIR "src/LiteCharmsSecurity.Admin.Api"
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ COPY ["src/LiteCharmsSecurity.Admin.EntityFramework.Shared/LiteCharmsSecurity.Ad
|
|||||||
COPY ["src/LiteCharmsSecurity.Admin.EntityFramework.SqlServer/LiteCharmsSecurity.Admin.EntityFramework.SqlServer.csproj", "src/LiteCharmsSecurity.Admin.EntityFramework.SqlServer/"]
|
COPY ["src/LiteCharmsSecurity.Admin.EntityFramework.SqlServer/LiteCharmsSecurity.Admin.EntityFramework.SqlServer.csproj", "src/LiteCharmsSecurity.Admin.EntityFramework.SqlServer/"]
|
||||||
COPY ["src/LiteCharmsSecurity.Shared/LiteCharmsSecurity.Shared.csproj", "src/LiteCharmsSecurity.Shared/"]
|
COPY ["src/LiteCharmsSecurity.Shared/LiteCharmsSecurity.Shared.csproj", "src/LiteCharmsSecurity.Shared/"]
|
||||||
|
|
||||||
RUN dotnet restore "src/LiteCharmsSecurity.Admin/LiteCharmsSecurity.Admin.csproj" --source "https://nexus.khongisa.co.za/repository/nuget-group/index.json"
|
RUN dotnet restore "src/LiteCharmsSecurity.Admin/LiteCharmsSecurity.Admin.csproj" --source "https://nexus.khongisa.co.za/repository/nuget-group/index.json" --verbosity detailed
|
||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
WORKDIR "src/LiteCharmsSecurity.Admin"
|
WORKDIR "src/LiteCharmsSecurity.Admin"
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ COPY ["src/LiteCharmsSecurity.STS.Identity/LiteCharmsSecurity.STS.Identity.cspro
|
|||||||
COPY ["src/LiteCharmsSecurity.Admin.EntityFramework.Shared/LiteCharmsSecurity.Admin.EntityFramework.Shared.csproj", "src/LiteCharmsSecurity.Admin.EntityFramework.Shared/"]
|
COPY ["src/LiteCharmsSecurity.Admin.EntityFramework.Shared/LiteCharmsSecurity.Admin.EntityFramework.Shared.csproj", "src/LiteCharmsSecurity.Admin.EntityFramework.Shared/"]
|
||||||
COPY ["src/LiteCharmsSecurity.Shared/LiteCharmsSecurity.Shared.csproj", "src/LiteCharmsSecurity.Shared/"]
|
COPY ["src/LiteCharmsSecurity.Shared/LiteCharmsSecurity.Shared.csproj", "src/LiteCharmsSecurity.Shared/"]
|
||||||
|
|
||||||
RUN dotnet restore "src/LiteCharmsSecurity.STS.Identity/LiteCharmsSecurity.STS.Identity.csproj" --source "https://nexus.khongisa.co.za/repository/nuget-group/index.json"
|
RUN dotnet restore "src/LiteCharmsSecurity.STS.Identity/LiteCharmsSecurity.STS.Identity.csproj" --source "https://nexus.khongisa.co.za/repository/nuget-group/index.json" --verbosity detailed
|
||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
WORKDIR "src/LiteCharmsSecurity.STS.Identity"
|
WORKDIR "src/LiteCharmsSecurity.STS.Identity"
|
||||||
|
|||||||
Reference in New Issue
Block a user