diff --git a/.ebextensions-dev/00-makeFiles.config b/.ebextensions-dev/00-makeFiles.config index f7a878b..8189c11 100644 --- a/.ebextensions-dev/00-makeFiles.config +++ b/.ebextensions-dev/00-makeFiles.config @@ -4,5 +4,5 @@ files: owner: webapp group: webapp content: | - kill `ps -ef | grep application | awk '{print $2}'` - java -Dspring.profiles.active=dev -Dfile.encoding=UTF-8 -jar /var/app/current/application.jar + kill `ps -ef | grep cocktaildakk-dev | awk '{print $2}'` + java -Dspring.profiles.active=dev -Dfile.encoding=UTF-8 -jar /var/app/current/cocktaildakk-dev.jar diff --git a/.github/workflows/dev-ci-cd.yml b/.github/workflows/dev-ci-cd.yml index fd5da0b..33fb43c 100644 --- a/.github/workflows/dev-ci-cd.yml +++ b/.github/workflows/dev-ci-cd.yml @@ -27,7 +27,7 @@ jobs: jwt.accesstoken.secret: ${{ secrets.JWT_SECRET_KEY }} jwt.refreshtoken.secret: ${{ secrets.JWT_REFRESH_KEY }} - - name: Set Environment Domain - Domain DEV Yml + - name: Set Environment Domain - DEV Yml uses: microsoft/variable-substitution@v1 with: files: src/main/resources/application-dev.yml @@ -55,10 +55,10 @@ jobs: - name: Generate deployment package run: | mkdir -p deploy - cp build/libs/cocktaildakk-0.0.1.jar deploy/application.jar + cp build/libs/*.jar deploy/cocktaildakk-dev.jar cp Procfile deploy/Procfile cp -r .ebextensions-dev deploy/.ebextensions - cd deploy && zip -r deploy.zip . + cd deploy && zip -r cocktaildakk-dev-${{steps.current-time.outputs.formattedTime}}-${{github.sha}}.zip . - name: Deploy Consumer to EB uses: einaregilsson/beanstalk-deploy@v21 @@ -69,5 +69,5 @@ jobs: environment_name: CocktaildakkDev-env version_label: cocktaildakk-dev-${{steps.current-time.outputs.formattedTime}}-${{github.sha}} region: ap-northeast-2 - deployment_package: deploy/deploy.zip + deployment_package: deploy/cocktaildakk-dev-${{steps.current-time.outputs.formattedTime}}-${{github.sha}}.zip wait_for_deployment: false \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index dcff5f1..bbd733f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -69,4 +69,8 @@ tasks.withType { tasks.withType { enabled = true duplicatesStrategy = DuplicatesStrategy.INCLUDE +} + +tasks.jar { + enabled = false } \ No newline at end of file