From 72026a8f994d28206ff4500f60d5428a10b5516d Mon Sep 17 00:00:00 2001 From: Timothy Schenk Date: Mon, 16 Sep 2024 21:11:40 +0200 Subject: [PATCH] fix(auth): exception initial character after login + otel --- .pre-commit-config.yaml | 39 +++++++++++++++----------- docker-compose.yml | 62 ++++++++++++++++++++--------------------- 2 files changed, 53 insertions(+), 48 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 31d6f0d..17b97b4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,19 +1,24 @@ repos: - - repo: local - hooks: +- repo: local + hooks: #Use dotnet format already installed on your machine - - id: dotnet-format - name: dotnet-format - language: system - entry: dotnet format --include - types_or: [c#, vb] - - repo: https://github.com/Mateusz-Grzelinski/actionlint-py - rev: v1.6.26.11 - hooks: - - id: actionlint - additional_dependencies: [pyflakes>=3.0.1, shellcheck-py>=0.9.0.5] - - repo: https://github.com/hadolint/hadolint - rev: v2.12.0 - hooks: - - id: hadolint-docker - args: [--ignore, SC2086] + - id: dotnet-format + name: dotnet-format + language: system + entry: dotnet format --include + types_or: [c#, vb] +- repo: https://github.com/Mateusz-Grzelinski/actionlint-py + rev: v1.6.26.11 + hooks: + - id: actionlint + additional_dependencies: [pyflakes>=3.0.1, shellcheck-py>=0.9.0.5] +- repo: https://github.com/hadolint/hadolint + rev: v2.12.0 + hooks: + - id: hadolint-docker + args: [--ignore, SC2086] +- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks + rev: v2.12.0 + hooks: + - id: pretty-format-yaml + args: [--autofix, --indent, '2'] diff --git a/docker-compose.yml b/docker-compose.yml index f2c7e84..13459da 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,31 +4,31 @@ services: image: continuity-auth:latest restart: always depends_on: - - db + - db environment: - - ENVIRONMENT=Development - - Testing:CreateAccountOnLogin=true - - DB:Host=db - - DB:Port=5432 - - DB:Username=continuity - - DB:Password=continuity - - Game:Data:Path=/app/data/ - - Tracing:Enabled=true - - OTEL_EXPORTER_OTLP_ENDPOINT=http://aspire:18889 - - Logging:LogLevel:Default=Debug + - ENVIRONMENT=Development + - Testing:CreateAccountOnLogin=true + - DB:Host=db + - DB:Port=5432 + - DB:Username=continuity + - DB:Password=continuity + - Game:Data:Path=/app/data/ + - Tracing:Enabled=true + - OTEL_EXPORTER_OTLP_ENDPOINT=http://aspire:18889 + - Logging:LogLevel:Default=Debug networks: - - continuity + - continuity ports: - - 10001:10001 + - 10001:10001 volumes: - - type: bind - source: wk-data - target: /app/data - read_only: true - - type: bind - source: config - target: /app/config - read_only: true + - type: bind + source: wk-data + target: /app/data + read_only: true + - type: bind + source: config + target: /app/config + read_only: true mem_limit: 1024m db: @@ -36,15 +36,15 @@ services: image: postgres:16.1-alpine restart: always environment: - - POSTGRES_USER=continuity - - POSTGRES_DB=continuity - - POSTGRES_PASSWORD=continuity + - POSTGRES_USER=continuity + - POSTGRES_DB=continuity + - POSTGRES_PASSWORD=continuity networks: - - continuity + - continuity volumes: - - db-data:/var/lib/postgresql/data + - db-data:/var/lib/postgresql/data healthcheck: - test: [CMD-SHELL, "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"] + test: [CMD-SHELL, 'pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}'] interval: 10s timeout: 3s retries: 3 @@ -53,12 +53,12 @@ services: aspire: image: mcr.microsoft.com/dotnet/aspire-dashboard:8.0.0 networks: - - continuity + - continuity environment: - - DOTNET_DASHBOARD_UNSECURED_ALLOW_ANONYMOUS=true - - Dashboard:Frontend:AuthMode=Unsecured + - DOTNET_DASHBOARD_UNSECURED_ALLOW_ANONYMOUS=true + - Dashboard:Frontend:AuthMode=Unsecured ports: - - 18888:18888 + - 18888:18888 networks: continuity: