From 9bd3cdae0e4b9193b8e1306d1ff5a7b77425a9c7 Mon Sep 17 00:00:00 2001 From: Jessica Singh Date: Thu, 25 Sep 2025 13:49:20 -0700 Subject: [PATCH 1/4] ports option by using env var --- .github/workflows/pr-integration-tests.yml | 4 ++++ .github/workflows/pr-mit-integration-tests.yml | 2 ++ deployment/docker_compose/docker-compose.yml | 8 ++++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr-integration-tests.yml b/.github/workflows/pr-integration-tests.yml index dcf25ff3fb1..24c2168d943 100644 --- a/.github/workflows/pr-integration-tests.yml +++ b/.github/workflows/pr-integration-tests.yml @@ -262,6 +262,8 @@ jobs: IMAGE_TAG=test \ INTEGRATION_TESTS_MODE=true \ CHECK_TTL_MANAGEMENT_TASK_FREQUENCY_IN_HOURS=0.001 \ + API_PORT=8080:8080 \ + POSTGRES_PORT=5432:5432 \ docker compose up \ relational_db \ index \ @@ -428,6 +430,8 @@ jobs: DISABLE_TELEMETRY=true \ IMAGE_TAG=test \ DEV_MODE=true \ + API_PORT=8080:8080 \ + POSTGRES_PORT=5432:5432 \ docker compose -f docker-compose.multitenant-dev.yml up \ relational_db \ index \ diff --git a/.github/workflows/pr-mit-integration-tests.yml b/.github/workflows/pr-mit-integration-tests.yml index 15806e7fe2e..2521eab4967 100644 --- a/.github/workflows/pr-mit-integration-tests.yml +++ b/.github/workflows/pr-mit-integration-tests.yml @@ -258,6 +258,8 @@ jobs: DISABLE_TELEMETRY=true \ IMAGE_TAG=test \ INTEGRATION_TESTS_MODE=true \ + API_PORT=8080:8080 \ + POSTGRES_PORT=5432:5432 \ docker compose up \ relational_db \ index \ diff --git a/deployment/docker_compose/docker-compose.yml b/deployment/docker_compose/docker-compose.yml index db99a130fd3..9b37862be80 100644 --- a/deployment/docker_compose/docker-compose.yml +++ b/deployment/docker_compose/docker-compose.yml @@ -53,8 +53,8 @@ services: - inference_model_server - minio restart: unless-stopped - # ports: - # - "8080:8080" + ports: + - "${API_PORT:-}" environment: # Auth Settings - AUTH_TYPE=${AUTH_TYPE:-basic} @@ -228,8 +228,8 @@ services: environment: - POSTGRES_USER=${POSTGRES_USER:-postgres} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password} - # ports: - # - "5432:5432" + ports: + - "${POSTGRES_PORT:-}" volumes: - db_volume:/var/lib/postgresql/data From 5b43b2838b2c30d924da1b4183cb8ded9f6f40f0 Mon Sep 17 00:00:00 2001 From: Jessica Singh Date: Thu, 25 Sep 2025 14:01:53 -0700 Subject: [PATCH 2/4] fix --- deployment/docker_compose/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/docker_compose/docker-compose.yml b/deployment/docker_compose/docker-compose.yml index 9b37862be80..fb3acba59b2 100644 --- a/deployment/docker_compose/docker-compose.yml +++ b/deployment/docker_compose/docker-compose.yml @@ -54,7 +54,7 @@ services: - minio restart: unless-stopped ports: - - "${API_PORT:-}" + - "${API_PORT}" environment: # Auth Settings - AUTH_TYPE=${AUTH_TYPE:-basic} @@ -229,7 +229,7 @@ services: - POSTGRES_USER=${POSTGRES_USER:-postgres} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password} ports: - - "${POSTGRES_PORT:-}" + - "${POSTGRES_PORT}" volumes: - db_volume:/var/lib/postgresql/data From 2fea661bbe61db408946cb82f1ea962a760d5359 Mon Sep 17 00:00:00 2001 From: Jessica Singh Date: Thu, 25 Sep 2025 14:19:23 -0700 Subject: [PATCH 3/4] add default port --- .github/workflows/pr-integration-tests.yml | 2 -- .github/workflows/pr-mit-integration-tests.yml | 1 - deployment/docker_compose/docker-compose.yml | 6 +++--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pr-integration-tests.yml b/.github/workflows/pr-integration-tests.yml index 24c2168d943..4a2913f0751 100644 --- a/.github/workflows/pr-integration-tests.yml +++ b/.github/workflows/pr-integration-tests.yml @@ -263,7 +263,6 @@ jobs: INTEGRATION_TESTS_MODE=true \ CHECK_TTL_MANAGEMENT_TASK_FREQUENCY_IN_HOURS=0.001 \ API_PORT=8080:8080 \ - POSTGRES_PORT=5432:5432 \ docker compose up \ relational_db \ index \ @@ -431,7 +430,6 @@ jobs: IMAGE_TAG=test \ DEV_MODE=true \ API_PORT=8080:8080 \ - POSTGRES_PORT=5432:5432 \ docker compose -f docker-compose.multitenant-dev.yml up \ relational_db \ index \ diff --git a/.github/workflows/pr-mit-integration-tests.yml b/.github/workflows/pr-mit-integration-tests.yml index 2521eab4967..bdf120be84c 100644 --- a/.github/workflows/pr-mit-integration-tests.yml +++ b/.github/workflows/pr-mit-integration-tests.yml @@ -259,7 +259,6 @@ jobs: IMAGE_TAG=test \ INTEGRATION_TESTS_MODE=true \ API_PORT=8080:8080 \ - POSTGRES_PORT=5432:5432 \ docker compose up \ relational_db \ index \ diff --git a/deployment/docker_compose/docker-compose.yml b/deployment/docker_compose/docker-compose.yml index fb3acba59b2..68e484a330c 100644 --- a/deployment/docker_compose/docker-compose.yml +++ b/deployment/docker_compose/docker-compose.yml @@ -54,7 +54,7 @@ services: - minio restart: unless-stopped ports: - - "${API_PORT}" + - "${API_PORT:-8080:8080}" environment: # Auth Settings - AUTH_TYPE=${AUTH_TYPE:-basic} @@ -228,8 +228,8 @@ services: environment: - POSTGRES_USER=${POSTGRES_USER:-postgres} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password} - ports: - - "${POSTGRES_PORT}" + # ports: + # - "5432:5432" volumes: - db_volume:/var/lib/postgresql/data From 23e0054cb059e265f3be6f09ea7af87e5f63d33d Mon Sep 17 00:00:00 2001 From: Jessica Singh Date: Thu, 25 Sep 2025 14:33:06 -0700 Subject: [PATCH 4/4] postgres --- .github/workflows/pr-integration-tests.yml | 1 + .github/workflows/pr-mit-integration-tests.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/pr-integration-tests.yml b/.github/workflows/pr-integration-tests.yml index 4a2913f0751..25be5620e5e 100644 --- a/.github/workflows/pr-integration-tests.yml +++ b/.github/workflows/pr-integration-tests.yml @@ -263,6 +263,7 @@ jobs: INTEGRATION_TESTS_MODE=true \ CHECK_TTL_MANAGEMENT_TASK_FREQUENCY_IN_HOURS=0.001 \ API_PORT=8080:8080 \ + POSTGRES_HOST=relational_db \ docker compose up \ relational_db \ index \ diff --git a/.github/workflows/pr-mit-integration-tests.yml b/.github/workflows/pr-mit-integration-tests.yml index bdf120be84c..6c72c2b623c 100644 --- a/.github/workflows/pr-mit-integration-tests.yml +++ b/.github/workflows/pr-mit-integration-tests.yml @@ -259,6 +259,7 @@ jobs: IMAGE_TAG=test \ INTEGRATION_TESTS_MODE=true \ API_PORT=8080:8080 \ + POSTGRES_HOST=relational_db \ docker compose up \ relational_db \ index \