prepare for Prometheus v2 upgrade

luckyluks · Feb 1, 2018 · 024ad7a · 024ad7a
1 parent e54526d
commit 024ad7a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,12 +21,12 @@ after_success:
       echo "PR build, skipping Docker Hub push";
     else
     docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
-    docker tag stefanprodan/swarmprom-prometheus:$TRAVIS_BUILD_NUMBER stefanprodan/swarmprom-prometheus:latest;
-    docker push stefanprodan/swarmprom-prometheus:latest;
-    docker tag stefanprodan/swarmprom-node-exporter:$TRAVIS_BUILD_NUMBER stefanprodan/swarmprom-node-exporter:latest;
-    docker push stefanprodan/swarmprom-node-exporter:latest;
-    docker tag stefanprodan/swarmprom-alertmanager:$TRAVIS_BUILD_NUMBER stefanprodan/swarmprom-alertmanager:latest;
-    docker push stefanprodan/swarmprom-alertmanager:latest;
-    docker tag stefanprodan/swarmprom-grafana:$TRAVIS_BUILD_NUMBER stefanprodan/swarmprom-grafana:latest;
-    docker push stefanprodan/swarmprom-grafana:latest;
+    docker tag stefanprodan/swarmprom-prometheus:$TRAVIS_BUILD_NUMBER stefanprodan/swarmprom-prometheus:v1.8.2;
+    docker push stefanprodan/swarmprom-prometheus:v1.8.2;
+    docker tag stefanprodan/swarmprom-node-exporter:$TRAVIS_BUILD_NUMBER stefanprodan/swarmprom-node-exporter:v0.14.0;
+    docker push stefanprodan/swarmprom-node-exporter:v0.14.0;
+    docker tag stefanprodan/swarmprom-alertmanager:$TRAVIS_BUILD_NUMBER stefanprodan/swarmprom-alertmanager:v0.9.1;
+    docker push stefanprodan/swarmprom-alertmanager:v0.9.1;
+    docker tag stefanprodan/swarmprom-grafana:$TRAVIS_BUILD_NUMBER stefanprodan/swarmprom-grafana:4.6.0;
+    docker push stefanprodan/swarmprom-grafana:4.6.0;
     fi
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -58,7 +58,7 @@ services:
           memory: 64M
 
   grafana:
-    image: stefanprodan/swarmprom-grafana
+    image: stefanprodan/swarmprom-grafana:4.6.0
     networks:
       - net
     environment:
@@ -87,7 +87,7 @@ services:
           memory: 64M
 
   alertmanager:
-    image: stefanprodan/swarmprom-alertmanager
+    image: stefanprodan/swarmprom-alertmanager:v0.9.1
     networks:
       - net
     environment:
@@ -122,7 +122,7 @@ services:
       replicas: 1
 
   node-exporter:
-    image: stefanprodan/swarmprom-node-exporter
+    image: stefanprodan/swarmprom-node-exporter:v0.14.0
     networks:
       - net
     environment:
@@ -147,7 +147,7 @@ services:
           memory: 64M
 
   prometheus:
-    image: stefanprodan/swarmprom-prometheus
+    image: stefanprodan/swarmprom-prometheus:v1.8.2
     networks:
       - net
     command:

diff --git a/weave-compose.yml b/weave-compose.yml
@@ -43,7 +43,7 @@ services:
       mode: global
 
   grafana:
-    image: stefanprodan/swarmprom-grafana
+    image: stefanprodan/swarmprom-grafana:4.6.0
     networks:
       - net
     environment:
@@ -67,7 +67,7 @@ services:
           - node.role == manager
 
   node-exporter:
-    image: stefanprodan/swarmprom-node-exporter
+    image: stefanprodan/swarmprom-node-exporter:v0.14.0
     networks:
       - net
     environment:
@@ -107,7 +107,7 @@ services:
           - node.role == manager
 
   prometheus:
-    image: stefanprodan/swarmprom-prometheus
+    image: stefanprodan/swarmprom-prometheus:v1.8.2
     networks:
       - net
     environment: