From 65fa2114a5f486966c6f506875f207ae5bcbf823 Mon Sep 17 00:00:00 2001 From: Hanna Lee <8annahxxl@gmail.com> Date: Sun, 10 Mar 2024 17:45:18 +0900 Subject: [PATCH] fix: env --- .aws/kiwing-task-def-dev.json | 7 ++++++- .aws/kiwing-task-def-prod.json | 7 ++++++- Dockerfile | 2 +- server/api/src/main/kotlin/com/kw/api/ApiApplication.kt | 1 - 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.aws/kiwing-task-def-dev.json b/.aws/kiwing-task-def-dev.json index b0a090c..900ee5b 100644 --- a/.aws/kiwing-task-def-dev.json +++ b/.aws/kiwing-task-def-dev.json @@ -16,7 +16,12 @@ } ], "essential": true, - "environment": [], + "environment": [ + { + "name": "SPRING_PROFILES_ACTIVE", + "value": "dev" + } + ], "environmentFiles": [], "mountPoints": [], "volumesFrom": [], diff --git a/.aws/kiwing-task-def-prod.json b/.aws/kiwing-task-def-prod.json index ef070e7..7d1997c 100644 --- a/.aws/kiwing-task-def-prod.json +++ b/.aws/kiwing-task-def-prod.json @@ -15,7 +15,12 @@ } ], "essential": true, - "environment": [], + "environment": [ + { + "name": "SPRING_PROFILES_ACTIVE", + "value": "prod" + } + ], "environmentFiles": [], "mountPoints": [], "volumesFrom": [], diff --git a/Dockerfile b/Dockerfile index 8ba2e9d..1f330f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM openjdk:17-jdk ARG JAR_PATH=server/api/build/libs COPY ${JAR_PATH}/api-0.0.1-SNAPSHOT.jar api.jar -ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=$PROFILE"] +ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=${SPRING_PROFILES_ACTIVE}"] CMD ["/api.jar"] diff --git a/server/api/src/main/kotlin/com/kw/api/ApiApplication.kt b/server/api/src/main/kotlin/com/kw/api/ApiApplication.kt index 4428326..3489345 100644 --- a/server/api/src/main/kotlin/com/kw/api/ApiApplication.kt +++ b/server/api/src/main/kotlin/com/kw/api/ApiApplication.kt @@ -2,7 +2,6 @@ package com.kw.api import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.runApplication -import org.springframework.context.annotation.ComponentScan @SpringBootApplication(scanBasePackages = arrayOf("com.kw")) class ApiApplication