From d779dfb7de7832f7d935c5ca61e14fc938ea76f4 Mon Sep 17 00:00:00 2001
From: Jonas Simoen <jonas.simoen@ugent.be>
Date: Sun, 19 May 2024 14:58:15 +0200
Subject: [PATCH] fix: deployments

---
 .github/workflows/deploy.yaml |  6 +++---
 docker-compose.metrics.yaml   | 11 ++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 73a32f6..3a095fb 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -22,7 +22,7 @@ jobs:
             sudo -i
             cd /var/www/api.dreamdraft.be
             git pull origin master
-            yarn install
-            yarn build
-            pm2 restart api --update-env
+            sudo /usr/local/bin/yarn install
+            sudo /usr/local/bin/yarn build
+            sudo /usr/local/bin/pm2 restart api --update-env
             exit
diff --git a/docker-compose.metrics.yaml b/docker-compose.metrics.yaml
index 7c21620..5859082 100644
--- a/docker-compose.metrics.yaml
+++ b/docker-compose.metrics.yaml
@@ -3,6 +3,7 @@ services:
 
   prometheus:
     image: prom/prometheus:latest
+    container_name: edd_prometheus
     volumes:
       - prometheus_data:/prometheus
       - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
@@ -10,9 +11,12 @@ services:
       - '--config.file=/etc/prometheus/prometheus.yml'
     ports:
       - '9090:9090'
+    networks:
+      - edd-metrics-nw
 
   grafana:
     image: grafana/grafana:latest
+    container_name: edd_grafana
     volumes:
       - grafana_data:/var/lib/grafana
       # - ./grafana/provisioning:/etc/grafana/provisioning
@@ -24,7 +28,12 @@ services:
       - prometheus
     ports:
       - '1234:3000'
+    networks:
+      - edd-metrics-nw
 
 volumes:
   prometheus_data: {}
-  grafana_data: {}
\ No newline at end of file
+  grafana_data: {}
+
+networks:
+  edd-metrics-nw:
\ No newline at end of file