Merge pull request #85 from Mojacknong/fix_82/클라우드-이전

Fix 82/클라우드 이전
Mojacknong · Aug 17, 2024 · ab6d574 · ab6d574
2 parents 9002e03 + e217668
commit ab6d574
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/dev-ci.yml
@@ -46,5 +46,4 @@ jobs:
 
       - name: Docker build & push to dockerhub
         run: |
-          docker build -f Dockerfile -t minchogt/farmus-spring .
-          docker push minchogt/farmus-spring
+          docker build -f Dockerfile -t modernfarmer/farmus-spring .
diff --git a/.github/workflows/dev-cicd.yml b/.github/workflows/dev-cicd.yml
@@ -2,7 +2,7 @@ name: cicd for development
 
 on:
   push:
-    branches: [ "dev" ]
+    branches: [ "dev", "fix_82/클라우드-이전" ]
 
 jobs:
   build:
@@ -46,9 +46,8 @@ jobs:
 
     - name: Docker build & push to dockerhub
       run: |
-          docker build -f Dockerfile -t minchogt/farmus-spring .
-          docker push minchogt/farmus-spring
-#          docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
+          docker build -f Dockerfile -t modernfarmer/farmus-spring .
+          docker push modernfarmer/farmus-spring
           
   deploy:
     needs: build
@@ -69,6 +68,7 @@ jobs:
             key: ${{ secrets.SSH_PRIVATE_KEY }}
             envs: GITHUB_SHA
             script: |
-                sudo docker pull minchogt/farmus-spring
-                ./deploy.sh
+                sudo docker pull modernfarmer/farmus-spring
+                cd docker-compose
+                bash deploy.sh
                 docker image prune -f