Update gradle.yml

.github/workflows/gradle.yml

@@ -1,58 +1,59 @@
-name: Java CI with Gradle
-
-on:
-  push:
-    branches: [ "develop" ]
-  pull_request:
-    branches: [ "develop" ]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-
-
-    - name: make application-prod.yml
-      run: |
-        cd ./src/main/resources
-        touch ./application-prod.yml
-        echo "${{ secrets.APPLICATION_PROD }}" > ./application-prod.yml
-
-
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-
-    - name: Build with Gradle
-      run: ./gradlew build -x test
-
-    - name: Docker build
-      run: |
-        docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-        docker build -t app .
-        docker tag app ${{ secrets.DOCKER_USERNAME }}/sejongmate:latest
-        docker push ${{ secrets.DOCKER_USERNAME }}/sejongmate:latest
-
-    - name: Deploy
-      uses: appleboy/ssh-action@master
-      with:
-        host: ${{ secrets.HOST }} # EC2 인스턴스 퍼블릭 DNS
-        username: ec2-user
-        key: ${{ secrets.PRIVATE_KEY }} # pem 키
-        # 도커 작업
-        script: |
-          docker pull ${{ secrets.DOCKER_USERNAME }}/sejongmate:latest
-          docker stop $(docker ps -a -q)
-          docker run -d --log-driver=syslog -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/sejongmate:latest
-          docker rm $(docker ps --filter 'status=exited' -a -q)
-          docker image prune -a -f
+name: Build and Deploy to EC2
+
+ on:
+   push:
+     branches: [ "develop" ]
+
+ jobs:
+   deploy:
+     runs-on: ubuntu-latest
+
+     steps:
+       - name: Checkout
+         uses: actions/checkout@v3
+
+       - name: Set up JDK 17
+         uses: actions/setup-java@v2
+         with:
+           java-version: '17'
+           distribution: 'temurin'
+
+       - name: Create application.yml
+         run: |
+           mkdir -p src/main/resources
+           echo "${{ secrets.APPLICATION_YML }}" > src/main/resources/application.yml
+
+#       - name: Create keystore.p12
+#         run: echo "${{ secrets.KEYSTORE_P12 }}" | base64 -d > src/main/resources/keystore.p12
+
+       - name: Grant execute permission for gradlew
+         run: chmod +x ./gradlew
+
+       - name: Spring Boot Build
+         run: ./gradlew clean build -x test
+
+       - name: Docker Image Build
+         run: docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_IMAGENAME }} .
+
+       - name: Docker Hub Login
+         uses: docker/login-action@v2
+         with:
+           username: ${{ secrets.DOCKERHUB_USERNAME }}
+           password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+       - name: Docker Hub push
+         run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_IMAGENAME }}
+
+       - name: AWS EC2 Connection
+         uses: appleboy/[email protected]
+         with:
+           host: ${{ secrets.EC2_HOST }}
+           username: ${{ secrets.EC2_USERNAME }}
+           password: ${{ secrets.EC2_PASSWORD }}
+           port: ${{ secrets.EC2_SSH_PORT }}
+           timeout: 60s
+           script: |
+             sudo docker stop ${{ secrets.DOCKERHUB_IMAGENAME }}
+             sudo docker rm ${{ secrets.DOCKERHUB_IMAGENAME }}
+             sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_IMAGENAME }}
+             sudo docker run -it -d -p 8080:8080 --name ${{ secrets.DOCKERHUB_IMAGENAME }} -e TZ=Asia/Seoul ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_IMAGENAME }}