From 419dbf018552f519ac716aeb948c4d64aa64eba1 Mon Sep 17 00:00:00 2001 From: Jonathan Bourdon Date: Wed, 6 May 2026 15:56:29 -0400 Subject: [PATCH] ci: align compose database host --- .gitea/workflows/deploy-socialize.yml | 8 +++++++- docker-compose.yml | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/deploy-socialize.yml b/.gitea/workflows/deploy-socialize.yml index 7223242..3e71a73 100644 --- a/.gitea/workflows/deploy-socialize.yml +++ b/.gitea/workflows/deploy-socialize.yml @@ -46,6 +46,8 @@ jobs: DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }} DEPLOY_USER: ${{ secrets.DEPLOY_USER }} DEPLOY_SSH_PRIVATE_KEY_B64: ${{ secrets.DEPLOY_SSH_PRIVATE_KEY_B64 }} + POSTGRES_HOST: ${{ secrets.POSTGRES_HOST }} + POSTGRES_PORT: ${{ secrets.POSTGRES_PORT }} POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }} RESEND_API_KEY: ${{ secrets.RESEND_API_KEY }} RESEND_FROM_EMAIL: ${{ secrets.RESEND_FROM_EMAIL }} @@ -57,6 +59,8 @@ jobs: : "${RESEND_FROM_EMAIL:?RESEND_FROM_EMAIL secret is required}" : "${JWT_SIGNING_KEY:?JWT_SIGNING_KEY secret is required}" : "${SOCIALIZE_IMAGE_TAG:?SOCIALIZE_IMAGE_TAG is required}" + POSTGRES_HOST="${POSTGRES_HOST:-db}" + POSTGRES_PORT="${POSTGRES_PORT:-5432}" mkdir -p ~/.ssh printf '%s' "$DEPLOY_SSH_PRIVATE_KEY_B64" | base64 -d > ~/.ssh/deploy_key @@ -72,9 +76,11 @@ jobs: deploy_env="$(mktemp)" { write_env_value POSTGRES_USER sa + write_env_value POSTGRES_HOST "$POSTGRES_HOST" + write_env_value POSTGRES_PORT "$POSTGRES_PORT" write_env_value POSTGRES_PASSWORD "$POSTGRES_PASSWORD" write_env_value POSTGRES_DB socialize - write_env_value ConnectionStrings__PostgresConnection "Host=postgres;Port=5432;Database=socialize;Username=sa;Password=$POSTGRES_PASSWORD" + write_env_value ConnectionStrings__PostgresConnection "Host=$POSTGRES_HOST;Port=$POSTGRES_PORT;Database=socialize;Username=sa;Password=$POSTGRES_PASSWORD" write_env_value ASPNETCORE_ENVIRONMENT Production write_env_value ASPNETCORE_URLS http://0.0.0.0:8080 write_env_value WEBSITE_FRONTEND_BASE_URL https://socialize.mapachotes.com diff --git a/docker-compose.yml b/docker-compose.yml index a3019e1..c62310d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ services: - postgres: + db: image: postgres:latest environment: POSTGRES_USER: ${POSTGRES_USER:-sa} @@ -20,7 +20,7 @@ services: environment: ASPNETCORE_ENVIRONMENT: ${ASPNETCORE_ENVIRONMENT:-Development} ASPNETCORE_URLS: http://0.0.0.0:8080 - ConnectionStrings__PostgresConnection: Host=postgres;Port=5432;Database=${POSTGRES_DB:-socialize};Username=${POSTGRES_USER:-sa};Password=${POSTGRES_PASSWORD:?POSTGRES_PASSWORD is required} + ConnectionStrings__PostgresConnection: Host=${POSTGRES_HOST:-db};Port=${POSTGRES_PORT:-5432};Database=${POSTGRES_DB:-socialize};Username=${POSTGRES_USER:-sa};Password=${POSTGRES_PASSWORD:?POSTGRES_PASSWORD is required} Website__FrontendBaseUrl: ${WEBSITE_FRONTEND_BASE_URL:-http://localhost:8080} Emailer__ApiKey: ${RESEND_API_KEY:-} Emailer__FromEmail: ${RESEND_FROM_EMAIL:-} @@ -30,7 +30,7 @@ services: Authentication__Jwt__Lifetime: ${JWT_LIFETIME:-00:05:00} Authentication__Jwt__RefreshTokenLifetime: ${JWT_REFRESH_TOKEN_LIFETIME:-0.00:30:00} depends_on: - postgres: + db: condition: service_healthy expose: - "8080"