fix: now docker-compose has default env vars

f-lab-edu · Feb 16, 2025 · 6627175 · 6627175
1 parent 42e0984
commit 6627175
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 22 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -18,6 +18,5 @@
       "installGradle": true
     }
   },
-  "forwardPorts": [8080, 5432],
-  "initializeCommand": "echo 'LOCAL_DB_NAME=zipsoon\nLOCAL_DB_USERNAME=postgres\nLOCAL_DB_PASSWORD=postgres\nLOCAL_SPRING_DATASOURCE_URL=jdbc:postgresql://localhost:5432/zipsoon\nNAVER_LAND_BASE_URL=https://new.land.naver.com/api\nNAVER_LAND_AUTH_TOKEN=\nLOCAL_JWT_SECRET=I0MmD+U3v9veSAsyg1bo7J3uKJo/N1qi3IdmOV86KDoTrSc0k3EGe7QIK7VGOX78iTPotJfJM7ZNKfBrrSLpOg==' > .env"
+  "forwardPorts": [8080, 5432]
 }
diff --git a/docker-compose.local.yml b/docker-compose.local.yml
@@ -5,32 +5,21 @@ networks:
 services:
   db:
     image: postgis/postgis:15-3.4
-    ports:
-      - "5432:5432"
-    environment:
-      - POSTGRES_DB=${LOCAL_DB_NAME}
-      - POSTGRES_USER=${LOCAL_DB_USERNAME}
-      - POSTGRES_PASSWORD=${LOCAL_DB_PASSWORD}
     volumes:
       - ./common/src/main/resources/init-users.sql:/docker-entrypoint-initdb.d/00-init-users.sql
       - ./common/src/main/resources/schema.sql:/docker-entrypoint-initdb.d/01-schema.sql
       - ./batch/src/main/resources/schema/schema-postgresql.sql:/docker-entrypoint-initdb.d/02-schema-postgresql.sql
+    ports:
+      - "5432:5432"
     networks:
       - zipsoon-network
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${LOCAL_DB_USERNAME} -d ${LOCAL_DB_NAME}"]
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
       interval: 5s
       timeout: 5s
       retries: 5
 
   batch:
-    environment:
-      - SPRING_PROFILES_ACTIVE=local
-      - SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/${LOCAL_DB_NAME}
-      - SPRING_DATASOURCE_USERNAME=${LOCAL_DB_USERNAME}
-      - SPRING_DATASOURCE_PASSWORD=${LOCAL_DB_PASSWORD}
-      - NAVER_LAND_BASE_URL=${NAVER_LAND_BASE_URL}
-      - NAVER_LAND_AUTH_TOKEN=${NAVER_LAND_AUTH_TOKEN}
     networks:
       - zipsoon-network
     depends_on:
@@ -40,12 +29,6 @@ services:
   api:
     ports:
       - "8080:8080"
-    environment:
-      - SPRING_PROFILES_ACTIVE=local
-      - SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/${LOCAL_DB_NAME}
-      - SPRING_DATASOURCE_USERNAME=${LOCAL_DB_USERNAME}
-      - SPRING_DATASOURCE_PASSWORD=${LOCAL_DB_PASSWORD}
-      - LOCAL_JWT_SECRET=${LOCAL_JWT_SECRET}
     networks:
       - zipsoon-network
     depends_on:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,10 +1,29 @@
 services:
+  db:
+    environment:
+      - POSTGRES_DB=${LOCAL_DB_NAME:-zipsoon}
+      - POSTGRES_USER=${LOCAL_DB_USERNAME:-postgres}
+      - POSTGRES_PASSWORD=${LOCAL_DB_PASSWORD:-postgres}
+
   batch:
     build:
       context: .
       dockerfile: batch/Dockerfile
+    environment:
+      - SPRING_PROFILES_ACTIVE=local
+      - LOCAL_SPRING_DATASOURCE_URL=${LOCAL_SPRING_DATASOURCE_URL:-jdbc:postgresql://db:5432/zipsoon}
+      - LOCAL_DB_USERNAME=${LOCAL_DB_USERNAME:-postgres}
+      - LOCAL_DB_PASSWORD=${LOCAL_DB_PASSWORD:-postgres}
+      - NAVER_LAND_BASE_URL=${NAVER_LAND_BASE_URL:-https://new.land.naver.com/api}
+      - NAVER_LAND_AUTH_TOKEN=${NAVER_LAND_AUTH_TOKEN:-}
 
   api:
     build:
       context: .
       dockerfile: api/Dockerfile
+    environment:
+      - SPRING_PROFILES_ACTIVE=local
+      - LOCAL_SPRING_DATASOURCE_URL=${LOCAL_SPRING_DATASOURCE_URL:-jdbc:postgresql://db:5432/zipsoon}
+      - LOCAL_DB_USERNAME=${LOCAL_DB_USERNAME:-postgres}
+      - LOCAL_DB_PASSWORD=${LOCAL_DB_PASSWORD:-postgres}
+      - LOCAL_JWT_SECRET=${LOCAL_JWT_SECRET:-I0MmD+U3v9veSAsyg1bo7J3uKJo/N1qi3IdmOV86KDoTrSc0k3EGe7QIK7VGOX78iTPotJfJM7ZNKfBrrSLpOg==}