Update github-actions.yml

.github/workflows/github-actions.yml

@@ -12,77 +12,73 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-latest
-    env :
+    env:
       working-directory: ./
       APPLICATION: ${{ secrets.APPLICATION_SECRET }}
 
     steps:
-    ## jdk setting
-    - uses: actions/checkout@v3
+    - name: Checkout code
+      uses: actions/checkout@v2
+
     - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v2
       with:
         java-version: '11'
         distribution: 'temurin'
 
-    ## gradle caching    
-    - name: Gradle Caching
-      uses: actions/cache@v3
+    - name: Cache Gradle dependencies
+      uses: actions/cache@v2
       with:
         path: |
-             ~/.gradle/caches
-             ~/.gradle/wrapper
+          ~/.gradle/caches
+          ~/.gradle/wrapper
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
         restore-keys: |
-              ${{ runner.os }}-gradle-
+          ${{ runner.os }}-gradle-
+
+    - name: Create application-secret.yml
+      run: |
+        mkdir -p ./src/main/resources
+        echo "${APPLICATION}" > ./src/main/resources/application-secret.yml
 
-    ## create application-secret.yml
-    - name: create application-secret.yml          
-    - uses: actions/checkout@v3
-    - run: |
-          mkdir ./src/main/resources
-          cd ./src/main/resources
-          touch ./application-secret.yml 
-          echo "${{env.APPLICATION_SECRET}}" > ./application-secret.yml
-    
     - name: Upload application-secret.yml artifact
-    - uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v2
       with:
         name: application-secret.yml
         path: ./src/main/resources/application-secret.yml
 
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
       working-directory: ${{ env.working-directory }}
-      
+
     - name: Build with Gradle
       run: ./gradlew build
       working-directory: ${{ env.working-directory }}
-        
+
     - name: Cleanup Gradle Cache
-      if: ${{ always() }}
+      if: always()
       run: |
-          rm -f ~/.gradle/caches/modules-2/modules-2.lock
-          rm -f ~/.gradle/caches/modules-2/gc.properties
+        rm -f ~/.gradle/caches/modules-2/modules-2.lock
+        rm -f ~/.gradle/caches/modules-2/gc.properties
 
-    - name: Docker build
+    - name: Docker build and push
       run: |
-          docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }}
-          docker build -t ${{ secrets.PROJECT_NAME }} .
-          docker tag ${{ secrets.PROJECT_NAME }} ${{ secrets.DOCKERHUB_REPO }}:${GITHUB_SHA::7}
-          docker push ${{ secrets.DOCKERHUB_REPO }}:${GITHUB_SHA::7}
+        docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }}
+        docker build -t ${{ secrets.PROJECT_NAME }} .
+        docker tag ${{ secrets.PROJECT_NAME }} ${{ secrets.DOCKERHUB_REPO }}:${{ github.sha }}
+        docker push ${{ secrets.DOCKERHUB_REPO }}:${{ github.sha }}
 
-    - name: Deploy
+    - name: Deploy to EC2
       uses: appleboy/ssh-action@master
       with:
-          host: ${{ secrets.EC2_HOST }}
-          username: ec2-user
-          key: ${{ secrets.PRIVATE_KEY }}
-          envs: GITHUB_SHA
-          script: |
-            docker rmi $(docker images -q)
-            docker pull ${{ secrets.DOCKER_HUB_REPO }}:${GITHUB_SHA::7}
-            docker tag ${{ secrets.DOCKER_HUB_REPO }}:${GITHUB_SHA::7} ${{ secrets.PROJECT_NAME }}
-            docker stop ${{ secrets.PROJECT_NAME }}
-            docker rm ${{ secrets.PROJECT_NAME }}
-            docker run -d --name ${{ secrets.PROJECT_NAME }} -p 80:8081 ${{ secrets.PROJECT_NAME }}
+        host: ${{ secrets.EC2_HOST }}
+        username: ec2-user
+        key: ${{ secrets.PRIVATE_KEY }}
+        envs: GITHUB_SHA
+        script: |
+          docker rmi $(docker images -q)
+          docker pull ${{ secrets.DOCKERHUB_REPO }}:${{ github.sha }}
+          docker tag ${{ secrets.DOCKERHUB_REPO }}:${{ github.sha }} ${{ secrets.PROJECT_NAME }}
+          docker stop ${{ secrets.PROJECT_NAME }} || true
+          docker rm ${{ secrets.PROJECT_NAME }} || true
+          docker run -d --name ${{ secrets.PROJECT_NAME }} -p 80:8081 ${{ secrets.PROJECT_NAME }}