From 0cab4e85306677c9a0e161fb30bd9aab2006555b Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 13 Jun 2026 11:26:43 -0400 Subject: [PATCH] Update postgresql port (#11) Reviewed-on: http://git.kundeng.us/phoenix/textsender-auth/pulls/11 --- .env.docker.sample | 2 +- .env.local.sample | 2 +- .gitea/workflows/workflow.yml | 3 ++- docker-compose.yml | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.env.docker.sample b/.env.docker.sample index 6c2c1d6..50203ae 100644 --- a/.env.docker.sample +++ b/.env.docker.sample @@ -5,6 +5,6 @@ DB_PASSWORD=password DB_HOST=auth_db DB_PORT=5432 DB_SSLMODE=disable -DATABASE_URL=postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:5432/${DB_NAME} +DATABASE_URL=postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME} ENABLE_REGISTRATION=true ALLOWED_ORIGINS="http://textsender.com" diff --git a/.env.local.sample b/.env.local.sample index 2625bcf..21ea4da 100644 --- a/.env.local.sample +++ b/.env.local.sample @@ -5,6 +5,6 @@ DB_PASSWORD=password DB_HOST=localhost DB_PORT=5432 DB_SSLMODE=disable -DATABASE_URL=postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:5432/${DB_NAME} +DATABASE_URL=postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME} ENABLE_REGISTRATION=true ALLOWED_ORIGINS="http://textsender.com" diff --git a/.gitea/workflows/workflow.yml b/.gitea/workflows/workflow.yml index a926d91..cdaa66d 100644 --- a/.gitea/workflows/workflow.yml +++ b/.gitea/workflows/workflow.yml @@ -41,6 +41,7 @@ jobs: POSTGRES_USER: ${{ secrets.DB_TEST_USER || 'testuser' }} POSTGRES_PASSWORD: ${{ secrets.DB_TEST_PASSWORD || 'testpassword' }} POSTGRES_DB: ${{ secrets.DB_TEST_NAME || 'testdb' }} + POSTGRES_PORT: ${{ secrets.DB_PORT || 5432 }} # Options to wait until the database is ready options: >- --health-cmd pg_isready @@ -71,7 +72,7 @@ jobs: - name: Run tests env: # Define DATABASE_URL for tests to use - DATABASE_URL: postgresql://${{ secrets.DB_TEST_USER || 'testuser' }}:${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}@postgres:5432/${{ secrets.DB_TEST_NAME || 'testdb' }} + DATABASE_URL: postgresql://${{ secrets.DB_TEST_USER || 'testuser' }}:${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}@postgres:${{ secrets.DB_PORT || 5432 }}/${{ secrets.DB_TEST_NAME || 'testdb' }} RUST_LOG: info # Optional: configure test log level SECRET_KEY: ${{ secrets.TOKEN_SECRET_KEY }} # Make SSH agent available if tests fetch private dependencies diff --git a/docker-compose.yml b/docker-compose.yml index d40dfeb..f3efba4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,8 @@ services: volumes: # Persist database data using a named volume - postgres_data:/var/lib/postgresql - ports: [] + ports: + - "5433:5432" healthcheck: # Checks if Postgres is ready to accept connections test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]