Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
annahxxl committed Mar 10, 2024
2 parents fdae55c + 65fa211 commit 878cb94
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
7 changes: 6 additions & 1 deletion .aws/kiwing-task-def-dev.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@
}
],
"essential": true,
"environment": [],
"environment": [
{
"name": "SPRING_PROFILES_ACTIVE",
"value": "dev"
}
],
"environmentFiles": [],
"mountPoints": [],
"volumesFrom": [],
Expand Down
7 changes: 6 additions & 1 deletion .aws/kiwing-task-def-prod.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
}
],
"essential": true,
"environment": [],
"environment": [
{
"name": "SPRING_PROFILES_ACTIVE",
"value": "prod"
}
],
"environmentFiles": [],
"mountPoints": [],
"volumesFrom": [],
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]
1 change: 0 additions & 1 deletion server/api/src/main/kotlin/com/kw/api/ApiApplication.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 878cb94

Please sign in to comment.