diff --git a/.env b/.env index 97a7dd0..ccc00b2 100644 --- a/.env +++ b/.env @@ -18,7 +18,7 @@ export GRAFANA_PORT=3000 export POSTGRES_DB=${COLLECTOR_DB} export POSTGRES_HOST=db export POSTGRES_PORT=5432 -export POSTGRES_USER=newsanalyzer +export POSTGRES_USER=postgresuser export PROJECT_VERSION=0.1.0 export PROMETHEUS_PORT=9090 export RABBITMQ_HOST=mq diff --git a/.github/workflows/ci-cd.yaml b/.github/workflows/ci-cd.yaml index b84f6af..eb27b51 100644 --- a/.github/workflows/ci-cd.yaml +++ b/.github/workflows/ci-cd.yaml @@ -12,7 +12,9 @@ jobs: POSTGRES_DB: collector_db POSTGRES_HOST: db POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }} - POSTGRES_USER: newsanalyzer + POSTGRES_USER: postgresuser + RABBITMQ_DEFAULT_PASS: ${{ secrets.RABBITMQ_DEFAULT_PASS }} + RABBITMQ_DEFAULT_USER: rabbituser services: db: image: postgres:16.2 @@ -29,6 +31,9 @@ jobs: - 5432:5432 mq: image: rabbitmq:3.13-management + env: + RABBITMQ_DEFAULT_PASS: ${{ secrets.RABBITMQ_DEFAULT_PASS }} + RABBITMQ_DEFAULT_USER: ${{ env.RABBITMQ_DEFAULT_USER }} ports: - 5672:5672 - 15692:15692