Merge branch 'devops' into development

DevMasters2-0 · Sep 11, 2024 · 1e63f7e · 1e63f7e
2 parents 329c411 + 219a679
commit 1e63f7e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 20 deletions.
diff --git a/.github/workflows/dev-push.yml b/.github/workflows/dev-push.yml
@@ -106,6 +106,5 @@ jobs:
           EMAIL_SMTP_USER: ${{ secrets.EMAIL_SMTP_USER }}
           EMAIL_SMTP_PASSWORD: ${{ secrets.EMAIL_SMTP_PASSWORD }}
           EMAIL_SMTP_SERVER: ${{ secrets.EMAIL_SMTP_SERVER }}
-          VITE_BASE_URL: ${{ secrets.VITE_BASE_URL }}
-          TEST: "true"
+          VITE_API_IMAGE: ${{ secrets.VITE_API_IMAGE }}
         run: docker-compose -f docker-compose-dev.yml -p dm-nms up -d
diff --git a/.github/workflows/prod-build.yml b/.github/workflows/prod-build.yml
@@ -32,29 +32,12 @@ jobs:
         run: npm run build
         env:
           VITE_API_KEY: ${{ secrets.VITE_API_KEY }}
-
-
-  build-admin:
-    runs-on: potus
-    needs: setup
-    steps:
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
       - name: Setup dependencias de admin
         working-directory: ./admin 
         run: npm install
       - name: Buildear admin
         working-directory: ./admin 
         run: npm run build   
-
-
-
-
-  deploy-front:
-    runs-on: potus
-    needs: [build-admin, build-client]
-    steps:
       - uses: lowply/deploy-firebase@v0.0.5
         env:
           FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
@@ -97,7 +80,10 @@ jobs:
             EMAIL_SMTP_USER: ${{ secrets.EMAIL_SMTP_USER }}
             EMAIL_SMTP_PASSWORD: ${{ secrets.EMAIL_SMTP_PASSWORD }}
             EMAIL_SMTP_SERVER: ${{ secrets.EMAIL_SMTP_SERVER }}
+<<<<<<< HEAD
             VITE_BASE_URL: ${{ secrets.VITE_BASE_URL }}
             TEST: "true"
+=======
+>>>>>>> devops
           run: docker-compose -f docker-compose-prod.yml -p dm-nms up -d
 
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -27,7 +27,7 @@ services:
     ports:
       - "5173:5173"
     environment:
-      - VITE_BASE_URL=${VITE_BASE_URL}
+      - VITE_API_IMAGE=${VITE_API_IMAGE}
 
 networks:
   default: