diff --git a/.github/workflows/cd-wordflow.yml b/.github/workflows/cd-wordflow.yml index b678557c..4b89af7e 100644 --- a/.github/workflows/cd-wordflow.yml +++ b/.github/workflows/cd-wordflow.yml @@ -35,6 +35,7 @@ jobs: cd ./src/main/resources touch ./application.yaml echo "${{ secrets.APPLICATION_YAML }}" > ./application.yaml + echo "${{ secrets.AWS_KEYSTORE }}" | base64 --decode > ./keystore-aws.p12 cd ../../test/resources touch ./application.yaml echo "${{ secrets.APPLICATION_TEST_YAML }}" > ./application.yaml @@ -57,16 +58,6 @@ jobs: cp ./appspec.yml ./deploy/ cp -r ./scripts ./deploy/ - # 압축파일 형태로 전달 - - name: Make zip file - run: zip -r ./springboot-intro-build.zip ./deploy - - # CodeDeploy 파일 복사 - - name: Copy CodeDeploy Files - run: | - cp ./appspec.yml ./deploy/ - cp -r ./scripts ./deploy/ - - name: Deliver to AWS S3 uses: aws-actions/configure-aws-credentials@v1 with: @@ -74,9 +65,6 @@ jobs: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - name: S3에 업로드 - run: aws deploy push --application-name ${{ secrets.AWS_CODE_DEPLOY_APPLICATION }} --ignore-hidden-files --s3-location s3://gamemuncheol-s3/deploy --source ./deploy + run: aws deploy push --application-name ${{ secrets.AWS_CODE_DEPLOY_APPLICATION }} --ignore-hidden-files --s3-location s3://gamemuncheol-s3/deploy.zip --source ./deploy - name: EC2에 배포 - # 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=cicdtest/$GITHUB_SHA.zip,bundleType=zip - run: aws deploy create-deployment --application-name ${{ secrets.AWS_CODE_DEPLOY_APPLICATION }} --deployment-config-name CodeDeployDefault.AllAtOnce --deployment-group-name ${{ secrets.AWS_CODE_DEPLOY_APPLICATION }} --s3-location bucket=gamemuncheol-s3,key=deploy/springboot-intro-build.zip,bundleType=zip - - + run: aws deploy create-deployment --application-name ${{ secrets.AWS_CODE_DEPLOY_APPLICATION }} --deployment-config-name CodeDeployDefault.AllAtOnce --deployment-group-name ${{ secrets.AWS_CODE_DEPLOY_APPLICATION }} --s3-location bucket=gamemuncheol-s3,key=deploy.zip,bundleType=zip diff --git a/scripts/start.sh b/scripts/start.sh index e29c1241..2dc55286 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -1,7 +1,7 @@ #!/bin/bash ROOT_PATH="/home/ubuntu/spring-github-action" -JAR="$ROOT_PATH/application.jar" +JAR="$ROOT_PATH/gamemoonchul-0.0.1-SNAPSHOT.jar" APP_LOG="$ROOT_PATH/application.log" ERROR_LOG="$ROOT_PATH/error.log" @@ -9,8 +9,6 @@ START_LOG="$ROOT_PATH/start.log" NOW=$(date +%c) -echo "[$NOW] $JAR 복사" >> $START_LOG -cp $ROOT_PATH/build/libs/spring-github-action-1.0.0.jar $JAR echo "[$NOW] > $JAR 실행" >> $START_LOG nohup java -jar $JAR > $APP_LOG 2> $ERROR_LOG & diff --git a/scripts/stop.sh b/scripts/stop.sh index 0330ede3..8aae8ab4 100644 --- a/scripts/stop.sh +++ b/scripts/stop.sh @@ -1,12 +1,12 @@ #!/bin/bash ROOT_PATH="/home/ubuntu/spring-github-action" -JAR="$ROOT_PATH/application.jar" +JAR="$ROOT_PATH/gamemoonchul-0.0.1-SNAPSHOT.jar" STOP_LOG="$ROOT_PATH/stop.log" SERVICE_PID=$(pgrep -f $JAR) # 실행중인 Spring 서버의 PID if [ -z "$SERVICE_PID" ]; then - echo "서비스 NouFound" >> $STOP_LOG + echo "서비스 NotFound" >> $STOP_LOG else echo "서비스 종료 " >> $STOP_LOG kill "$SERVICE_PID"