From 62d2ddaca3c5c81ae0a508baa24a05071db575e7 Mon Sep 17 00:00:00 2001
From: tmddn3070 <tmddn3070@gmail.com>
Date: Fri, 10 May 2024 08:01:12 +0900
Subject: [PATCH] FIX : Docker Build Fix

---
 .github/workflows/docker-build.yml | 41 +++++++++++++++++-------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index b2e85ac..4c6d11e 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -1,24 +1,29 @@
+name: Docker image build and push
+
+on:
+  push:
+    branches: [ "master" ]
+  pull-request:
+
 jobs:
-  docker_build:
+
+  build-push:
+
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Docker Build
-        run: docker build -t git.runa.pw/tmddn3070/runabot:latest .
-      - name: Docker Registry
-        run: echo ${{ secrets.DOCKER_PASSWORD }} | docker login git.runa.pw -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-      - name: Docker Push
-        run: docker push git.runa.pw/tmddn3070/runabot:latest
 
-on:
-  workflow_dispatch:
-  pull_request:
-  push:
-    branches:
-      - main
-    # skip-build가 커밋 메시지에 있으면 빌드를 건너뛴다.
-    paths-ignore:
-      - 'skip-build'
\ No newline at end of file
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          registry: git.runa.pw
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: tmddn3070/runabot:latest