refactor : 머지 충돌 해결

YAPP-Github · Jul 16, 2024 · 2c26ec9 · 2c26ec9
2 parents 2588139 + 4453884
commit 2c26ec9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/showpot-dev-cd.yml b/.github/workflows/showpot-dev-cd.yml
@@ -38,7 +38,7 @@ jobs:
         run: |
           mkdir -p deployment
           cp Dockerfile docker-compose.yml deployment/
-          cp -r ./app/build/libs deployment/
+          cp -r ./app deployment/
 
       - name: Get Github Actions IP
         id: ip

diff --git a/.gitignore b/.gitignore
@@ -179,7 +179,7 @@ gradle-app.setting
 ### QClass ###
 **/src/main/generated/
 
-# End of https://www.toptal.com/developers/gitignore/api/java,intellij+all,macos,gradle
-
 ### application-cloud-local.yml
-app/src/main/resources/application-cloud-local.yml
+app/src/main/resources/application-cloud-local.yml
+
+# End of https://www.toptal.com/developers/gitignore/api/java,intellij+all,macos,gradle
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
 FROM openjdk:21-jdk-slim
-ARG JAR_FILE_PATH=libs/*.jar
+ARG JAR_FILE_PATH=app/build/libs/*.jar
 COPY ${JAR_FILE_PATH} app.jar
 ENTRYPOINT ["java", "-jar", "app.jar"]