From 901adad27689faedc6291aa168b70eb5947ed137 Mon Sep 17 00:00:00 2001
From: linglong67 <88479739+linglong67@users.noreply.github.com>
Date: Thu, 29 Feb 2024 15:58:10 +0900
Subject: [PATCH 1/2] Update cicd-dev.yml

---
 .github/workflows/cicd-dev.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cicd-dev.yml b/.github/workflows/cicd-dev.yml
index f5333206..c8919f95 100644
--- a/.github/workflows/cicd-dev.yml
+++ b/.github/workflows/cicd-dev.yml
@@ -2,7 +2,7 @@ name: CI and CD in WashPedia Project
 
 on:
   push:
-    branches: [ "develop" ]
+    branches: [ "feature/modify-cicd-dev-yml" ]
 
 permissions:
   contents: read
@@ -122,9 +122,11 @@ jobs:
             echo "${{ secrets.DB_INIT_SQL }}" > init.sql
             echo "${{ secrets.DEV_REDIS_CONF }}" > ./redis/redis.conf
             echo "${{ secrets.DOCKER_COMPOSE }}" > docker-compose.yml
+
+            echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login --username ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
             
             docker image prune -af
             
             docker-compose pull
             docker-compose down
-            docker-compose up -d
\ No newline at end of file
+            docker-compose up -d

From 2c8bc2c319dd1d33e5e4f5cb743ac64638e18c61 Mon Sep 17 00:00:00 2001
From: linglong67 <88479739+linglong67@users.noreply.github.com>
Date: Thu, 29 Feb 2024 16:02:31 +0900
Subject: [PATCH 2/2] Update cicd-dev.yml

---
 .github/workflows/cicd-dev.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cicd-dev.yml b/.github/workflows/cicd-dev.yml
index c8919f95..bec9e75b 100644
--- a/.github/workflows/cicd-dev.yml
+++ b/.github/workflows/cicd-dev.yml
@@ -2,7 +2,7 @@ name: CI and CD in WashPedia Project
 
 on:
   push:
-    branches: [ "feature/modify-cicd-dev-yml" ]
+    branches: [ "develop" ]
 
 permissions:
   contents: read