From 0a87b5bf90af80c6fac64cb2f813b82727165398 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EC=9E=AC=ED=95=9C?=
 <99114456+jaehan4707@users.noreply.github.com>
Date: Thu, 18 Jul 2024 22:58:18 +0900
Subject: [PATCH] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 2086b0e..30fdf11 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -19,7 +19,7 @@ jobs:
           java-version: '19'
           distribution: 'temurin'
 
-      - name: Set up application.properites
+      - name: Set up application.properties
         run: echo "${{ secrets.APPLICATION_PROPERTIES }}" > ./src/main/resources/application.properties
 
       - name: Set up Maven
@@ -35,25 +35,27 @@ jobs:
       - name: Install with Maven
         run: mvn install
 
+      - name: Log in to Docker Hub
+        run: echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+
       - name: Build the Docker image
-        run: |
-          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{secrets.DOCKER_PASSWORD}}
-          docker build -t ${{secrets.DOCKER_REPO }}  
-          docker push ${{ secrets.DOCKER_REPO }} 
-          
+        run: docker build -t ${{ secrets.DOCKER_REPO }} .
+
+      - name: Push the Docker image
+        run: docker push ${{ secrets.DOCKER_REPO }}
+
       - name: Deploy to EC2 Server
         uses: appleboy/ssh-action@master
         with: 
-          host: ${{ secrets.EC2_HOST}}
-          username : ec2-user
-          key : ${{secrets.EC2_SSH_PRIVATE_KEY}}
+          host: ${{ secrets.EC2_HOST }}
+          username: ec2-user
+          key: ${{ secrets.EC2_SSH_PRIVATE_KEY }}
           script: |
             CONTAINER_ID=$(sudo docker ps -q --filter "publish=80-8080")
             if [ ! -z "$CONTAINER_ID" ]; then
               sudo docker stop $CONTAINER_ID
               sudo docker rm $CONTAINER_ID
             fi
-            sudo docker pull ${{secrets.DOCKER_REPO }}
-            sudo docker run -- name ${{ secrets.DOCKER_CONTAINER_NAME }} -d -p 8080:8080
-            sudo docker logs ${{secrets.DOCKER_CONTAINER_NAME}}
-            
+            sudo docker pull ${{ secrets.DOCKER_REPO }}
+            sudo docker run --name ${{ secrets.DOCKER_CONTAINER_NAME }} -d -p 8080:8080 ${{ secrets.DOCKER_REPO }}
+            sudo docker logs ${{ secrets.DOCKER_CONTAINER_NAME }}