chore: application-aws.yml 변경

depromeet · Oct 26, 2024 · 3f84d7e · 3f84d7e
1 parent cf8e330
commit 3f84d7e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/k3s-dev.yaml b/.github/workflows/k3s-dev.yaml
@@ -72,7 +72,7 @@ jobs:
 
     env:
       DEPLOY_TARGET: ${{ needs.setup.outputs.deploy_target }}
-      APPLICATION_SECRET_PROPERTIES: ${{ secrets.APPLICATION_SECRET_PROP`ERTIES }}
+      APPLICATION_SECRET_PROPERTIES: ${{ secrets.APPLICATION_SECRET_PROPERTIES }}
       GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }}
       SHA_SHORT: ${{ needs.setup.outputs.sha_short }}
       CHANGED_MODULES: ${{ needs.setup.outputs.changed_modules }}

diff --git a/layer-api/src/main/resources/application-aws.yml b/layer-api/src/main/resources/application-aws.yml
@@ -2,9 +2,9 @@ spring:
   config:
     import: optional:file:/config/application-secret.properties
   datasource:
-    url: ${{ secrets.AWS_PROD_DB_URL }}
-    username: ${{ secrets.AWS_PROD_DB_NAME }}
-    password: ${{ secrets.AWS_PROD_DB_PASSWORD }}
+    url: ${AWS_PROD_DB_URL}
+    username: ${AWS_PROD_DB_NAME}
+    password: ${AWS_PROD_DB_PASSWORD}
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     hibernate:

diff --git a/layer-batch/Dockerfile b/layer-batch/Dockerfile
@@ -7,4 +7,4 @@ COPY ${JAR_FILE} layer-batch.jar
 
 ENV SPRING_PROFILE=${SPRING_PROFILE}
 
-ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul","-Dspring.profiles.active=aws" ,"-jar" ,"layer-batch.jar"]
+ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul" ,"-jar" ,"layer-batch.jar"]
diff --git a/layer-batch/src/main/resources/application.yml b/layer-batch/src/main/resources/application.yml
@@ -5,9 +5,9 @@ spring:
   config:
     import: application-secret.properties
   datasource:
-    url: ${{ secrets.AWS_PROD_DB_URL }}
-    username: ${{ secrets.AWS_PROD_DB_NAME }}
-    password: ${{ secrets.AWS_PROD_DB_PASSWORD }}
+    url: ${AWS_PROD_DB_URL}
+    username: ${AWS_PROD_DB_NAME}
+    password: ${AWS_PROD_DB_PASSWORD}
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     hibernate:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,4 @@ COPY ${JAR_FILE} layer-batch.jar

		ENV SPRING_PROFILE=${SPRING_PROFILE}

		ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul","-Dspring.profiles.active=aws" ,"-jar" ,"layer-batch.jar"]
		ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul" ,"-jar" ,"layer-batch.jar"]