prueba despliegue develop

Arquisoft · Apr 29, 2022 · 4a83030 · 4a83030
1 parent 82892f0
commit 4a83030
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 26 deletions.
diff --git a/.github/workflows/asw2122.yml b/.github/workflows/asw2122.yml
@@ -83,7 +83,7 @@ jobs:
         user: ${{ secrets.DEPLOY_USER }}
         key: ${{ secrets.DEPLOY_KEY }}
         command: |
-          wget https://github.com/Arquisoft/dede_es6b/blob/master/docker-compose-deploy.yml -O docker-compose.yml
+          wget https://github.com/Arquisoft/dede_es6b/blob/develop/docker-compose-deploy.yml -O docker-compose.yml
           docker-compose stop
           docker-compose rm -f
           docker-compose pull   

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,5 @@
 version: '3.5'
 volumes:
-  prometheus_data: {}
-  grafana_data: {}
 services:
   restapi:
     build: ./restapi
@@ -13,26 +11,3 @@ services:
       - "3000:3000"
     depends_on:
       - restapi
-  prometheus:
-    image: prom/prometheus
-    volumes:
-      - ./restapi/monitoring/prometheus:/etc/prometheus
-      - prometheus_data:/prometheus
-    ports:
-      - "9090:9090"
-    depends_on:
-      - restapi
-  grafana:
-    image: grafana/grafana
-    volumes:
-      - grafana_data:/var/lib/grafana
-      - ./restapi/monitoring/grafana/provisioning:/etc/grafana/provisioning
-    environment:
-      - GF_SERVER_HTTP_PORT=9091
-      - GF_AUTH_DISABLE_LOGIN_FORM=true
-      - GF_AUTH_ANONYMOUS_ENABLED=true
-      - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
-    ports:
-      - "9091:9091"
-    depends_on:
-      - restapi