From 5289181ad6a2cb36dce978cea9ef12af2b30bed6 Mon Sep 17 00:00:00 2001 From: Khwezi Mngoma Date: Fri, 5 Jun 2026 23:35:46 +0200 Subject: [PATCH 1/2] Refactored project paths in docker files --- .gitignore | 3 ++- docker-compose.override.yml | 20 -------------------- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 docker-compose.override.yml diff --git a/.gitignore b/.gitignore index 9491a2f..3b5ceb0 100644 --- a/.gitignore +++ b/.gitignore @@ -360,4 +360,5 @@ MigrationBackup/ .ionide/ # Fody - auto-generated XML schema -FodyWeavers.xsd \ No newline at end of file +FodyWeavers.xsd +/docker-compose.override.yml diff --git a/docker-compose.override.yml b/docker-compose.override.yml deleted file mode 100644 index 46105bf..0000000 --- a/docker-compose.override.yml +++ /dev/null @@ -1,20 +0,0 @@ -version: '3.4' - -services: - litecharmssecurity.admin: - environment: - - ASPNETCORE_ENVIRONMENT=Development - volumes: - - ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:ro - - litecharmssecurity.admin.api: - environment: - - ASPNETCORE_ENVIRONMENT=Development - volumes: - - ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:ro - - litecharmssecurity.sts.identity: - environment: - - ASPNETCORE_ENVIRONMENT=Development - volumes: - - ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:ro From f88847148e2b84fccacb13f2124f70460e301ca7 Mon Sep 17 00:00:00 2001 From: Khwezi Mngoma Date: Fri, 5 Jun 2026 23:36:09 +0200 Subject: [PATCH 2/2] Refactored project paths --- src/LiteCharmsSecurity.Admin.Api/Dockerfile | 2 +- src/LiteCharmsSecurity.Admin/Dockerfile | 11 ++++------- src/LiteCharmsSecurity.STS.Identity/Dockerfile | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/LiteCharmsSecurity.Admin.Api/Dockerfile b/src/LiteCharmsSecurity.Admin.Api/Dockerfile index 1e998b8..43b6cca 100644 --- a/src/LiteCharmsSecurity.Admin.Api/Dockerfile +++ b/src/LiteCharmsSecurity.Admin.Api/Dockerfile @@ -13,7 +13,7 @@ COPY ["src/LiteCharmsSecurity.Shared/LiteCharmsSecurity.Shared.csproj", "src/Lit COPY ["src/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL.csproj", "src/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL/"] RUN dotnet restore -a $TARGETARCH "src/LiteCharmsSecurity.Admin.Api/LiteCharmsSecurity.Admin.Api.csproj" COPY . . -WORKDIR "/src/src/LiteCharmsSecurity.Admin.Api" +WORKDIR "src/LiteCharmsSecurity.Admin.Api" RUN dotnet build -a $TARGETARCH "LiteCharmsSecurity.Admin.Api.csproj" -c Release -o /app/build FROM build AS publish diff --git a/src/LiteCharmsSecurity.Admin/Dockerfile b/src/LiteCharmsSecurity.Admin/Dockerfile index f5b1b5a..5eafa67 100644 --- a/src/LiteCharmsSecurity.Admin/Dockerfile +++ b/src/LiteCharmsSecurity.Admin/Dockerfile @@ -18,18 +18,15 @@ RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm \ && node --version && npm --version COPY ["src/LiteCharmsSecurity.Admin/LiteCharmsSecurity.Admin.csproj", "src/LiteCharmsSecurity.Admin/"] -COPY ["src/LiteCharmsSecurity.Admin.EntityFramework.Identity/LiteCharmsSecurity.Admin.EntityFramework.Identity.csproj", "src/LiteCharmsSecurity.Admin.EntityFramework.Identity/"] -COPY ["src/LiteCharmsSecurity.Admin.EntityFramework/LiteCharmsSecurity.Admin.EntityFramework.csproj", "src/LiteCharmsSecurity.Admin.EntityFramework/"] -COPY ["src/LiteCharmsSecurity.Admin.EntityFramework.Extensions/LiteCharmsSecurity.Admin.EntityFramework.Extensions.csproj", "src/LiteCharmsSecurity.Admin.EntityFramework.Extensions/"] -COPY ["src/LiteCharmsSecurity.Admin.EntityFramework.Configuration/LiteCharmsSecurity.Admin.EntityFramework.Configuration.csproj", "src/LiteCharmsSecurity.Admin.EntityFramework.Configuration/"] -COPY ["src/LiteCharmsSecurity.Admin.UI/LiteCharmsSecurity.Admin.UI.csproj", "src/LiteCharmsSecurity.Admin.UI/"] -COPY ["src/LiteCharmsSecurity.Shared.Configuration/LiteCharmsSecurity.Shared.Configuration.csproj", "src/LiteCharmsSecurity.Shared.Configuration/"] +COPY ["src/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL.csproj", "src/LiteCharmsSecurity.Admin.EntityFramework.PostgreSQL/"] COPY ["src/LiteCharmsSecurity.Admin.EntityFramework.Shared/LiteCharmsSecurity.Admin.EntityFramework.Shared.csproj", "src/LiteCharmsSecurity.Admin.EntityFramework.Shared/"] +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/"] RUN dotnet restore -a $TARGETARCH "src/LiteCharmsSecurity.Admin/LiteCharmsSecurity.Admin.csproj" COPY . . -WORKDIR "/src/src/LiteCharmsSecurity.Admin" +WORKDIR "src/LiteCharmsSecurity.Admin" RUN dotnet build -a $TARGETARCH "LiteCharmsSecurity.Admin.csproj" -c Release -o /app/build FROM build AS publish diff --git a/src/LiteCharmsSecurity.STS.Identity/Dockerfile b/src/LiteCharmsSecurity.STS.Identity/Dockerfile index 6d95ee4..e726756 100644 --- a/src/LiteCharmsSecurity.STS.Identity/Dockerfile +++ b/src/LiteCharmsSecurity.STS.Identity/Dockerfile @@ -11,7 +11,7 @@ COPY ["src/LiteCharmsSecurity.Admin.EntityFramework.Shared/LiteCharmsSecurity.Ad COPY ["src/LiteCharmsSecurity.Shared/LiteCharmsSecurity.Shared.csproj", "src/LiteCharmsSecurity.Shared/"] RUN dotnet restore -a $TARGETARCH "src/LiteCharmsSecurity.STS.Identity/LiteCharmsSecurity.STS.Identity.csproj" COPY . . -WORKDIR "/src/src/LiteCharmsSecurity.STS.Identity" +WORKDIR "src/LiteCharmsSecurity.STS.Identity" RUN dotnet build -a $TARGETARCH "LiteCharmsSecurity.STS.Identity.csproj" -c Release -o /app/build FROM build AS publish