From f9bed10ec6dcb72d5e198f6b3b2623dd5da8f269 Mon Sep 17 00:00:00 2001 From: mikekks Date: Fri, 6 Sep 2024 09:33:34 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20=EC=8A=A4=ED=94=84=EB=A7=81=20?= =?UTF-8?q?=ED=94=84=EB=A1=9C=ED=95=84=20=EB=8F=99=EC=A0=81=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=A3=BC=EC=9E=85=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/k3s-dev.yaml | 2 +- .github/workflows/k3s-prod.yaml | 2 +- layer-api/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/k3s-dev.yaml b/.github/workflows/k3s-dev.yaml index d9c22f7d..bef2a125 100644 --- a/.github/workflows/k3s-dev.yaml +++ b/.github/workflows/k3s-dev.yaml @@ -138,7 +138,7 @@ jobs: run: | for MODULE in $(echo $CHANGED_MODULES | tr "," "\n"); do IMAGE_TAG="${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}/$MODULE:${{ env.SHA_SHORT }}" - docker build ./$MODULE -t $IMAGE_TAG + docker build --build-arg SPRING_PROFILE=dev ./$MODULE -t $IMAGE_TAG docker push $IMAGE_TAG done diff --git a/.github/workflows/k3s-prod.yaml b/.github/workflows/k3s-prod.yaml index 263bf99b..cfbbc34a 100644 --- a/.github/workflows/k3s-prod.yaml +++ b/.github/workflows/k3s-prod.yaml @@ -124,7 +124,7 @@ jobs: run: | for MODULE in $(echo $CHANGED_MODULES | tr "," "\n"); do IMAGE_TAG="${{ env.REGISTRY }}/${{ env.NAMESPACE }}/${{ env.IMAGE_NAME }}/$MODULE:${{ env.SHA_SHORT }}" - docker build ./$MODULE -t $IMAGE_TAG + docker build --build-arg SPRING_PROFILE=prod ./$MODULE -t $IMAGE_TAG docker push $IMAGE_TAG done diff --git a/layer-api/Dockerfile b/layer-api/Dockerfile index d792f5bf..04505691 100644 --- a/layer-api/Dockerfile +++ b/layer-api/Dockerfile @@ -7,4 +7,4 @@ COPY ${JAR_FILE} layer-server.jar ENV SPRING_PROFILE=${SPRING_PROFILE} -ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul","-Dspring.profiles.active=prod" ,"-jar" ,"layer-server.jar"] \ No newline at end of file +ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul","-Dspring.profiles.active=${SPRING_PROFILE}" ,"-jar" ,"layer-server.jar"] \ No newline at end of file