diff --git a/.github/workflows/showpot-dev-cd.yml b/.github/workflows/showpot-dev-cd.yml index 47399d9c..8a69dc75 100644 --- 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 index bc0df916..72f03805 100644 --- a/.gitignore +++ b/.gitignore @@ -179,4 +179,6 @@ gradle-app.setting ### QClass ### **/src/main/generated/ +app/src/main/resources/application-cloud-local.yml + # End of https://www.toptal.com/developers/gitignore/api/java,intellij+all,macos,gradle \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 0c96825e..eaf61e51 100644 --- 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"] \ No newline at end of file diff --git a/app/src/main/resources/application.yml b/app/src/main/resources/application.yml index 17cdf0e0..a0e457bd 100644 --- a/app/src/main/resources/application.yml +++ b/app/src/main/resources/application.yml @@ -4,6 +4,6 @@ spring: profiles: active: local group: - local: domain-local + local: domain-local, cloud-local dev: domain-dev prod: domain-prod