chore(telegraf,grafana,influx): Update to 0.3.4 base

deis · Sep 26, 2016 · 1a10082 · 1a10082
1 parent 145ca6a
commit 1a10082
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/grafana/rootfs/Dockerfile b/grafana/rootfs/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/deis/base:0.3.1
+FROM quay.io/deis/base:v0.3.4
 
 COPY . /
 

diff --git a/influxdb/rootfs/Dockerfile b/influxdb/rootfs/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/deis/base:0.3.1
+FROM quay.io/deis/base:v0.3.4
 
 RUN adduser --system \
 	--shell /bin/bash \

diff --git a/telegraf/manifests/deis-monitor-telegraf-daemon.yaml b/telegraf/manifests/deis-monitor-telegraf-daemon.yaml
@@ -43,15 +43,13 @@ spec:
             value: "metrics"
           - name: "NSQ_ENDPOINTS"
             value: "\"http://$(DEIS_NSQD_SERVICE_HOST):$(DEIS_NSQD_SERVICE_PORT_HTTP)\""
-          {{- if env "LOGGER_REDIS_LOCATION" | default .logger_redis_location | ne "off-cluster" }}
           - name: DEIS_LOGGER_REDIS_PASSWORD
             valueFrom:
               secretKeyRef:
                 name: logger-redis-creds
                 key: password
           - name: "REDIS_SERVERS"
             value: "\"tcp://:$(DEIS_LOGGER_REDIS_PASSWORD)@$(DEIS_LOGGER_REDIS_SERVICE_HOST):$(DEIS_LOGGER_REDIS_SERVICE_PORT)\""
-          {{- end }}
           volumeMounts:
           - mountPath: /var/run/docker.sock
             name: docker-socket

diff --git a/telegraf/rootfs/Dockerfile b/telegraf/rootfs/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/deis/base:0.3.1
+FROM quay.io/deis/base:v0.3.4
 
 COPY . /