use Prometheus v2.2.0-rc.0 due to know bug in v2.1

luckyluks · Feb 14, 2018 · 1c95f26 · 1c95f26
1 parent 6797cde
commit 1c95f26
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,13 +20,13 @@ after_success:
   - if [ -z "$DOCKER_USER" ]; then
       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: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;
+    docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
+    docker tag stefanprodan/swarmprom-prometheus:$TRAVIS_BUILD_NUMBER stefanprodan/swarmprom-prometheus:v2.2.0-rc.0;
+    docker push stefanprodan/swarmprom-prometheus:v2.2.0-rc.0;
+    docker tag stefanprodan/swarmprom-node-exporter:$TRAVIS_BUILD_NUMBER stefanprodan/swarmprom-node-exporter:v0.15.2;
+    docker push stefanprodan/swarmprom-node-exporter:v0.15.2;
+    docker tag stefanprodan/swarmprom-alertmanager:$TRAVIS_BUILD_NUMBER stefanprodan/swarmprom-alertmanager:v0.14.0;
+    docker push stefanprodan/swarmprom-alertmanager:v0.14.0;
+    docker tag stefanprodan/swarmprom-grafana:$TRAVIS_BUILD_NUMBER stefanprodan/swarmprom-grafana:4.6.3;
+    docker push stefanprodan/swarmprom-grafana:4.6.3;
     fi
diff --git a/alertmanager/Dockerfile b/alertmanager/Dockerfile
@@ -1,4 +1,4 @@
-FROM prom/alertmanager:v0.13.0
+FROM prom/alertmanager:v0.14.0
 
 COPY conf /etc/alertmanager/
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -87,7 +87,7 @@ services:
           memory: 64M
 
   alertmanager:
-    image: stefanprodan/swarmprom-alertmanager:v0.13.0
+    image: stefanprodan/swarmprom-alertmanager:v0.14.0
     networks:
       - net
     environment:
@@ -150,7 +150,7 @@ services:
           memory: 64M
 
   prometheus:
-    image: stefanprodan/swarmprom-prometheus:v2.1.0
+    image: stefanprodan/swarmprom-prometheus:v2.2.0-rc.0
     networks:
       - net
     command:

diff --git a/prometheus/Dockerfile b/prometheus/Dockerfile
@@ -1,4 +1,4 @@
-FROM prom/prometheus:v2.1.0
+FROM prom/prometheus:v2.2.0-rc.0
 # https://hub.docker.com/r/prom/prometheus/tags/
 
 ENV WEAVE_TOKEN=none

diff --git a/weave-compose.yml b/weave-compose.yml
@@ -110,7 +110,7 @@ services:
           - node.role == manager
 
   prometheus:
-    image: stefanprodan/swarmprom-prometheus:v2.1.0
+    image: stefanprodan/swarmprom-prometheus:v2.2.0-rc.0
     networks:
       - net
     environment: