diff --git a/.env.example b/web/.env.example similarity index 100% rename from .env.example rename to web/.env.example diff --git a/.csharpierrc.json b/web/backend/.csharpierrc.json similarity index 78% rename from .csharpierrc.json rename to web/backend/.csharpierrc.json index afd1cb3..a37e1b8 100644 --- a/.csharpierrc.json +++ b/web/backend/.csharpierrc.json @@ -1,6 +1,4 @@ { - "$schema": "https://json.schemastore.org/csharpier.json", - "printWidth": 80, "useTabs": false, "indentSize": 4, diff --git a/docker-compose.db.yaml b/web/docker-compose.db.yaml similarity index 86% rename from docker-compose.db.yaml rename to web/docker-compose.db.yaml index caed3c6..be5244c 100644 --- a/docker-compose.db.yaml +++ b/web/docker-compose.db.yaml @@ -1,5 +1,5 @@ services: - sqlserver: + sqlserver: env_file: ".env.dev" image: mcr.microsoft.com/mssql/server:2022-latest platform: linux/amd64 @@ -13,14 +13,18 @@ services: volumes: - sqlserverdata-dev:/var/opt/mssql healthcheck: - test: ["CMD-SHELL", "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P '${DB_PASSWORD}' -C -Q 'SELECT 1' || exit 1"] + test: + [ + "CMD-SHELL", + "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P '${DB_PASSWORD}' -C -Q 'SELECT 1' || exit 1", + ] interval: 10s timeout: 5s retries: 12 start_period: 30s networks: - devnet - database.migrations: + database.migrations: env_file: ".env.dev" image: database.migrations container_name: dev-env-database-migrations @@ -28,7 +32,7 @@ services: sqlserver: condition: service_healthy build: - context: ./src/Core/Database + context: ./backend/Database dockerfile: Database.Migrations/Dockerfile args: BUILD_CONFIGURATION: Release @@ -44,7 +48,7 @@ services: networks: - devnet - database.seed: + database.seed: env_file: ".env.dev" image: database.seed container_name: dev-env-database-seed @@ -52,7 +56,7 @@ services: database.migrations: condition: service_completed_successfully build: - context: ./src/Core + context: ./backend dockerfile: Database/Database.Seed/Dockerfile args: BUILD_CONFIGURATION: Release diff --git a/docker-compose.dev.yaml b/web/docker-compose.dev.yaml similarity index 92% rename from docker-compose.dev.yaml rename to web/docker-compose.dev.yaml index 4b66ed0..bcf31ac 100644 --- a/docker-compose.dev.yaml +++ b/web/docker-compose.dev.yaml @@ -13,7 +13,11 @@ services: volumes: - sqlserverdata-dev:/var/opt/mssql healthcheck: - test: [ "CMD-SHELL", "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P '${DB_PASSWORD}' -C -Q 'SELECT 1' || exit 1" ] + test: + [ + "CMD-SHELL", + "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P '${DB_PASSWORD}' -C -Q 'SELECT 1' || exit 1", + ] interval: 10s timeout: 5s retries: 12 @@ -28,7 +32,7 @@ services: sqlserver: condition: service_healthy build: - context: ./src/Core/Database + context: ./backend/Database dockerfile: Database.Migrations/Dockerfile args: BUILD_CONFIGURATION: Release @@ -52,7 +56,7 @@ services: database.migrations: condition: service_completed_successfully build: - context: ./src/Core + context: ./backend dockerfile: Database/Database.Seed/Dockerfile args: BUILD_CONFIGURATION: Release @@ -75,7 +79,7 @@ services: database.seed: condition: service_completed_successfully build: - context: ./src/Core + context: ./backend dockerfile: API/API.Core/Dockerfile args: BUILD_CONFIGURATION: Release diff --git a/docker-compose.min.yaml b/web/docker-compose.min.yaml similarity index 90% rename from docker-compose.min.yaml rename to web/docker-compose.min.yaml index 2b580dc..a8a56ac 100644 --- a/docker-compose.min.yaml +++ b/web/docker-compose.min.yaml @@ -13,7 +13,11 @@ services: volumes: - sqlserverdata-dev:/var/opt/mssql healthcheck: - test: [ "CMD-SHELL", "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P '${DB_PASSWORD}' -C -Q 'SELECT 1' || exit 1" ] + test: + [ + "CMD-SHELL", + "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P '${DB_PASSWORD}' -C -Q 'SELECT 1' || exit 1", + ] interval: 10s timeout: 5s retries: 12 @@ -28,7 +32,7 @@ services: sqlserver: condition: service_healthy build: - context: ./src/Core/Database + context: ./backend/Database dockerfile: Database.Migrations/Dockerfile args: BUILD_CONFIGURATION: Release @@ -66,7 +70,7 @@ services: database.migrations: condition: service_completed_successfully build: - context: ./src/Core + context: ./backend dockerfile: Database/Database.Seed/Dockerfile args: BUILD_CONFIGURATION: Release diff --git a/docker-compose.prod.yaml b/web/docker-compose.prod.yaml similarity index 90% rename from docker-compose.prod.yaml rename to web/docker-compose.prod.yaml index 72eaf12..a2267a7 100644 --- a/docker-compose.prod.yaml +++ b/web/docker-compose.prod.yaml @@ -11,7 +11,11 @@ services: volumes: - sqlserverdata-prod:/var/opt/mssql healthcheck: - test: ["CMD-SHELL", "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P '${DB_PASSWORD}' -C -Q 'SELECT 1' || exit 1"] + test: + [ + "CMD-SHELL", + "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P '${DB_PASSWORD}' -C -Q 'SELECT 1' || exit 1", + ] interval: 10s timeout: 5s retries: 12 @@ -27,7 +31,7 @@ services: sqlserver: condition: service_healthy build: - context: ./src/Core/Database + context: ./backend/Database dockerfile: Database.Migrations/Dockerfile args: BUILD_CONFIGURATION: Release @@ -50,7 +54,7 @@ services: sqlserver: condition: service_healthy build: - context: ./src/Core + context: ./backend dockerfile: API/API.Core/Dockerfile args: BUILD_CONFIGURATION: Release diff --git a/docker-compose.test.yaml b/web/docker-compose.test.yaml similarity index 92% rename from docker-compose.test.yaml rename to web/docker-compose.test.yaml index dea63c2..4ca37c1 100644 --- a/docker-compose.test.yaml +++ b/web/docker-compose.test.yaml @@ -12,7 +12,11 @@ services: volumes: - sqlserverdata-test:/var/opt/mssql healthcheck: - test: [ "CMD-SHELL", "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P '${DB_PASSWORD}' -C -Q 'SELECT 1' || exit 1" ] + test: + [ + "CMD-SHELL", + "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P '${DB_PASSWORD}' -C -Q 'SELECT 1' || exit 1", + ] interval: 10s timeout: 5s retries: 12 @@ -28,7 +32,7 @@ services: sqlserver: condition: service_healthy build: - context: ./src/Core/Database + context: ./backend/Database dockerfile: Database.Migrations/Dockerfile args: BUILD_CONFIGURATION: Release @@ -52,7 +56,7 @@ services: database.migrations: condition: service_completed_successfully build: - context: ./src/Core + context: ./backend dockerfile: Database/Database.Seed/Dockerfile args: BUILD_CONFIGURATION: Release @@ -75,7 +79,7 @@ services: database.seed: condition: service_completed_successfully build: - context: ./src/Core + context: ./backend dockerfile: API/API.Specs/Dockerfile args: BUILD_CONFIGURATION: Release @@ -103,7 +107,7 @@ services: database.seed: condition: service_completed_successfully build: - context: ./src/Core + context: ./backend dockerfile: Infrastructure/Infrastructure.Repository.Tests/Dockerfile args: BUILD_CONFIGURATION: Release @@ -123,7 +127,7 @@ services: database.seed: condition: service_completed_successfully build: - context: ./src/Core + context: ./backend dockerfile: Service/Service.Auth.Tests/Dockerfile args: BUILD_CONFIGURATION: Release