Merge branch 'devops_7' into 'devops' from pull request #37

#7 Изменения пайплайнов frontend и пуша в main ветку
NikitaBuffy · Dec 10, 2024 · c0fb8bf · c0fb8bf
2 parents 6328fa9 + 81a5af0
commit c0fb8bf
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 24 deletions.
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
@@ -1,9 +1,12 @@
-name: Vue CI
+name: Frontend CI/CD
 
 on:
   pull_request:
     branches:
       - frontend
+  push:
+    branches:
+      - frontend
   workflow_dispatch:
 
 jobs:
@@ -63,4 +66,34 @@ jobs:
           SONAR_PROJECT_KEY: ${{ secrets.SONAR_PROJECT_KEY }}
         run: |
           cd frontend
-          npx sonar-scanner -Dsonar.projectKey=$SONAR_PROJECT_KEY -Dsonar.projectName='lenka-messenger' -Dsonar.sources=src -Dsonar.pullrequest.key=${{ github.event.number}} -Dsonar.pullrequest.branch=${{ github.event.pull_request.head.ref }} -Dsonar.pullrequest.base=${{ github.event.pull_request.base.ref }} -Dsonar.scm.revision=${{ github.event.pull_request.head.sha }} -Dsonar.host.url=$SONAR_HOST_URL
+          npx sonar-scanner -Dsonar.projectKey=$SONAR_PROJECT_KEY -Dsonar.projectName='lenka-messenger' -Dsonar.sources=src -Dsonar.pullrequest.key=${{ github.event.number}} -Dsonar.pullrequest.branch=${{ github.event.pull_request.head.ref }} -Dsonar.pullrequest.base=${{ github.event.pull_request.base.ref }} -Dsonar.scm.revision=${{ github.event.pull_request.head.sha }} -Dsonar.host.url=$SONAR_HOST_URL
+  
+  deploy-to-dockerhub:
+    if: github.ref == 'refs/heads/frontend'
+    runs-on: ubuntu-latest
+    needs: build-and-analyze
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Download frontend build artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: frontend-dist
+          path: /frontend/dist
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and push frontend image
+        run: |
+          cd frontend
+          docker build -t nickpominov/lm-frontend:latest .
+          docker push nickpominov/lm-frontend:latest
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -56,28 +56,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Download Frontend Artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: frontend-dist
-          path: frontend/dist/
-
-      - name: Build and Push Frontend Image
-        run: |
-          cd frontend
-          docker build -t nickpominov/lm-frontend:latest .
-          docker push nickpominov/lm-frontend:latest
-
-      - name: Deploy Frontend to Remote Server
+      - name: Deploy frontend to remote server
         uses: appleboy/[email protected]
         with:
           host: ${{ secrets.SERVER_IP }}