Merge pull request #25 from dappnode/update_grafana_prometheus

eduadiez · web-flow · commit aac3326c4216 · 2021-09-24T17:43:41.000+02:00
Add UPSTREAM parameter and update versions
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,13 +1,19 @@
 version: "3.4"
 services:
   grafana:
-    build: ./grafana
+    build: 
+      context: grafana
+      args:
+        UPSTREAM_VERSION: 8.1.5
     image: "grafana.dms.dnp.dappnode.eth:1.0.1"
     restart: always
     volumes:
       - "grafana_data:/var/lib/grafana"
   prometheus:
-    build: ./prometheus
+    build: 
+      context: prometheus
+      args:
+        UPSTREAM_VERSION: v2.30.0
     image: "prometheus.dms.dnp.dappnode.eth:1.0.1"
     restart: always
     volumes:
diff --git a/grafana/Dockerfile b/grafana/Dockerfile
@@ -1,4 +1,6 @@
-FROM grafana/grafana:7.3.3
+ARG UPSTREAM_VERSION
+
+FROM grafana/grafana:${UPSTREAM_VERSION}
 
 USER root
 
diff --git a/prometheus/Dockerfile b/prometheus/Dockerfile
@@ -1,4 +1,6 @@
-FROM prom/prometheus
+ARG UPSTREAM_VERSION
+
+FROM prom/prometheus:${UPSTREAM_VERSION}
 
 COPY prometheus.yml /etc/prometheus/
 
