undo POSTGRES_SQL_SERVICE_HOST/PORT in docker-compose (#5462)

project-koku · Jan 22, 2025 · ee89131 · ee89131
1 parent fb81de0
commit ee89131
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/.env.example b/.env.example
@@ -4,8 +4,8 @@ DATABASE_NAME=postgres
 PGADMIN_EMAIL=[email protected]
 PGADMIN_PASSWORD=postgres
 PGADMIN_PORT=8432
-POSTGRES_SQL_SERVICE_HOST=db
-POSTGRES_SQL_SERVICE_PORT=5432
+POSTGRES_SQL_SERVICE_HOST=localhost
+POSTGRES_SQL_SERVICE_PORT=15432
 DATABASE_USER=postgres
 DATABASE_ADMIN=postgres
 DATABASE_PASSWORD=postgres

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -25,8 +25,8 @@ services:
       - DATABASE_SERVICE_NAME=POSTGRES_SQL
       - DATABASE_ENGINE=postgresql
       - DATABASE_NAME=${DATABASE_NAME-postgres}
-      - POSTGRES_SQL_SERVICE_HOST=${POSTGRES_SQL_SERVICE_HOST-db}
-      - POSTGRES_SQL_SERVICE_PORT=${POSTGRES_SQL_SERVICE_PORT-5432}
+      - POSTGRES_SQL_SERVICE_HOST=db
+      - POSTGRES_SQL_SERVICE_PORT=5432
       - DATABASE_USER=${DATABASE_USER-postgres}
       - DATABASE_PASSWORD=${DATABASE_PASSWORD-postgres}
       - KOKU_SOURCES_CLIENT_HOST=${KOKU_SOURCES_CLIENT_HOST-sources-client}
@@ -92,8 +92,8 @@ services:
       - DATABASE_SERVICE_NAME=POSTGRES_SQL
       - DATABASE_ENGINE=postgresql
       - DATABASE_NAME=${DATABASE_NAME-postgres}
-      - POSTGRES_SQL_SERVICE_HOST=${POSTGRES_SQL_SERVICE_HOST-db}
-      - POSTGRES_SQL_SERVICE_PORT=${POSTGRES_SQL_SERVICE_PORT-5432}
+      - POSTGRES_SQL_SERVICE_HOST=db
+      - POSTGRES_SQL_SERVICE_PORT=5432
       - DATABASE_USER=${DATABASE_USER-postgres}
       - DATABASE_PASSWORD=${DATABASE_PASSWORD-postgres}
       - S3_BUCKET_NAME_OCP_INGRESS=${S3_BUCKET_NAME_OCP_INGRESS-ocp-ingress}
@@ -165,8 +165,8 @@ services:
       - DATABASE_SERVICE_NAME=POSTGRES_SQL
       - DATABASE_ENGINE=postgresql
       - DATABASE_NAME=${DATABASE_NAME-postgres}
-      - POSTGRES_SQL_SERVICE_HOST=${POSTGRES_SQL_SERVICE_HOST-db}
-      - POSTGRES_SQL_SERVICE_PORT=${POSTGRES_SQL_SERVICE_PORT-5432}
+      - POSTGRES_SQL_SERVICE_HOST=db
+      - POSTGRES_SQL_SERVICE_PORT=5432
       - DATABASE_USER=${DATABASE_USER-postgres}
       - DATABASE_PASSWORD=${DATABASE_PASSWORD-postgres}
       - REDIS_HOST=${REDIS_HOST-redis}
@@ -261,8 +261,8 @@ services:
     environment:
       - DJANGO_READ_DOT_ENV_FILE=True
       - DATABASE_SERVICE_NAME=POSTGRES_SQL
-      - POSTGRES_SQL_SERVICE_HOST=${POSTGRES_SQL_SERVICE_HOST-db}
-      - POSTGRES_SQL_SERVICE_PORT=${POSTGRES_SQL_SERVICE_PORT-5432}
+      - POSTGRES_SQL_SERVICE_HOST=db
+      - POSTGRES_SQL_SERVICE_PORT=5432
       - DATABASE_ENGINE=postgresql
       - DATABASE_NAME=${DATABASE_NAME-postgres}
       - DATABASE_HOST=db
@@ -312,8 +312,8 @@ services:
       - DATABASE_SERVICE_NAME=POSTGRES_SQL
       - DATABASE_ENGINE=postgresql
       - DATABASE_NAME=${DATABASE_NAME-postgres}
-      - POSTGRES_SQL_SERVICE_HOST=${POSTGRES_SQL_SERVICE_HOST-db}
-      - POSTGRES_SQL_SERVICE_PORT=${POSTGRES_SQL_SERVICE_PORT-5432}
+      - POSTGRES_SQL_SERVICE_HOST=db
+      - POSTGRES_SQL_SERVICE_PORT=5432
       - DATABASE_USER=${DATABASE_USER-postgres}
       - DATABASE_PASSWORD=${DATABASE_PASSWORD-postgres}
       - KOKU_API_HOST=${KOKU_API_HOST-koku-server}
@@ -367,8 +367,8 @@ services:
       - DATABASE_SERVICE_NAME=POSTGRES_SQL
       - DATABASE_ENGINE=postgresql
       - DATABASE_NAME=${DATABASE_NAME-postgres}
-      - POSTGRES_SQL_SERVICE_HOST=${POSTGRES_SQL_SERVICE_HOST-db}
-      - POSTGRES_SQL_SERVICE_PORT=${POSTGRES_SQL_SERVICE_PORT-5432}
+      - POSTGRES_SQL_SERVICE_HOST=db
+      - POSTGRES_SQL_SERVICE_PORT=5432
       - DATABASE_USER=${DATABASE_USER-postgres}
       - DATABASE_PASSWORD=${DATABASE_PASSWORD-postgres}
       - KOKU_API_HOST=${KOKU_API_HOST-koku-server}
@@ -425,8 +425,8 @@ services:
       - DATABASE_SERVICE_NAME=POSTGRES_SQL
       - DATABASE_ENGINE=postgresql
       - DATABASE_NAME=${DATABASE_NAME-postgres}
-      - POSTGRES_SQL_SERVICE_HOST=${POSTGRES_SQL_SERVICE_HOST-db}
-      - POSTGRES_SQL_SERVICE_PORT=${POSTGRES_SQL_SERVICE_PORT-5432}
+      - POSTGRES_SQL_SERVICE_HOST=db
+      - POSTGRES_SQL_SERVICE_PORT=5432
       - DATABASE_USER=${DATABASE_USER-postgres}
       - DATABASE_PASSWORD=${DATABASE_PASSWORD-postgres}
       - REDIS_HOST=${REDIS_HOST-redis}
@@ -643,8 +643,8 @@ services:
       - S3_SECRET=${S3_SECRET-kokuminiosecret}
       - S3_BUCKET_NAME=${S3_BUCKET_NAME-koku-bucket}
       - S3_BUCKET_PATH=data
-      - POSTGRES_SQL_SERVICE_HOST=${POSTGRES_SQL_SERVICE_HOST-db}
-      - POSTGRES_SQL_SERVICE_PORT=${POSTGRES_SQL_SERVICE_PORT-5432}
+      - POSTGRES_SQL_SERVICE_HOST=db
+      - POSTGRES_SQL_SERVICE_PORT=5432
       - DATABASE_NAME=${DATABASE_NAME-hive}
       - DATABASE_USER=${DATABASE_USER-hive}
       - DATABASE_PASSWORD=${DATABASE_PASSWORD-hive}
@@ -672,8 +672,8 @@ services:
       - S3_SECRET=${S3_SECRET-kokuminiosecret}
       - S3_REGION=${S3_REGION-us-east-1}
       - AWS_CATALOG_ID=${AWS_CATALOG_ID-}
-      - POSTGRES_SQL_SERVICE_HOST=${POSTGRES_SQL_SERVICE_HOST-db}
-      - POSTGRES_SQL_SERVICE_PORT=${POSTGRES_SQL_SERVICE_PORT-5432}
+      - POSTGRES_SQL_SERVICE_HOST=db
+      - POSTGRES_SQL_SERVICE_PORT=5432
       - DATABASE_NAME=${DATABASE_NAME-postgres}
       - DATABASE_USER=${DATABASE_USER-postgres}
       - DATABASE_PASSWORD=${DATABASE_PASSWORD-postgres}