Merge branch 'tukcomCD2024:master' into master

ksh-g001 · Jan 27, 2024 · f5ae2b9 · f5ae2b9
2 parents eabe907 + c968c00
commit f5ae2b9
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 15 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -51,7 +51,9 @@ jobs:
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
       - name: Upload to S3
+        working-directory: ./backend
         run: aws deploy push --application-name ${{ env.AWS_CODE_DEPLOY_APPLICATION }} --ignore-hidden-files --s3-location s3://$AWS_S3_BUCKET/HowAboutTrip-EC2/$GITHUB_SHA.zip --source .
 
       - name: Code Deploy to EC2
+        working-directory: ./backend
         run: aws deploy create-deployment --application-name ${{ env.AWS_CODE_DEPLOY_APPLICATION }} --deployment-config-name CodeDeployDefault.AllAtOnce --deployment-group-name ${{ env.AWS_CODE_DEPLOY_GROUP }} --s3-location bucket=$AWS_S3_BUCKET,key=HowAboutTrip-EC2/$GITHUB_SHA.zip,bundleType=zip
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/sonarlint/issuestore/b/2/b29bd1f7028776d53a3de51178113ae25a5efa01 b/.idea/sonarlint/issuestore/b/2/b29bd1f7028776d53a3de51178113ae25a5efa01
diff --git a/.idea/sonarlint/issuestore/b/f/bf8a91d94ba6d87e3accbb8ff83cce215d706910 b/.idea/sonarlint/issuestore/b/f/bf8a91d94ba6d87e3accbb8ff83cce215d706910
diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb
diff --git a/.idea/sonarlint/securityhotspotstore/b/2/b29bd1f7028776d53a3de51178113ae25a5efa01 b/.idea/sonarlint/securityhotspotstore/b/2/b29bd1f7028776d53a3de51178113ae25a5efa01
diff --git a/.idea/sonarlint/securityhotspotstore/index.pb b/.idea/sonarlint/securityhotspotstore/index.pb
diff --git a/appspec.yml → backend/appspec.yml b/appspec.yml → backend/appspec.yml
diff --git a/scripts/deploy.sh → backend/scripts/deploy.sh b/scripts/deploy.sh → backend/scripts/deploy.sh
diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
@@ -1,8 +1,3 @@
-server:
-  port: 5000
-  servlet:
-    context-path: /
-
 spring:
   jpa:
     database: MYSQL