Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update telegraf image #4603

Merged
merged 1 commit into from
Jul 17, 2018
Merged

Update telegraf image #4603

merged 1 commit into from
Jul 17, 2018

Conversation

jsternberg
Copy link
Contributor

No description provided.

@yosifkit
Copy link
Member

warning: insecure protocol git:// detected: git://github.com/influxdata/influxdata-docker

Diff:
diff --git a/telegraf_1.5.3-alpine/Dockerfile b/telegraf_1.5.3-alpine/Dockerfile
index a6121c5..85fdd22 100644
--- a/telegraf_1.5.3-alpine/Dockerfile
+++ b/telegraf_1.5.3-alpine/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.6
 
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
-RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps && \
+RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors && \
     update-ca-certificates
 
 ENV TELEGRAF_VERSION 1.5.3
diff --git a/telegraf_1.5.3/Dockerfile b/telegraf_1.5.3/Dockerfile
index 1fa22c0..ad8607c 100644
--- a/telegraf_1.5.3/Dockerfile
+++ b/telegraf_1.5.3/Dockerfile
@@ -1,7 +1,7 @@
 FROM buildpack-deps:stretch-curl
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors && \
     rm -rf /var/lib/apt/lists/*
 
 RUN set -ex && \
diff --git a/telegraf_1.6.4-alpine/Dockerfile b/telegraf_1.6.4-alpine/Dockerfile
index 5d4e446..4d26eaa 100644
--- a/telegraf_1.6.4-alpine/Dockerfile
+++ b/telegraf_1.6.4-alpine/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.6
 
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
-RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps && \
+RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors && \
     update-ca-certificates
 
 ENV TELEGRAF_VERSION 1.6.4
diff --git a/telegraf_1.6.4/Dockerfile b/telegraf_1.6.4/Dockerfile
index 81666fd..4265be7 100644
--- a/telegraf_1.6.4/Dockerfile
+++ b/telegraf_1.6.4/Dockerfile
@@ -1,7 +1,7 @@
 FROM buildpack-deps:stretch-curl
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors && \
     rm -rf /var/lib/apt/lists/*
 
 RUN set -ex && \
diff --git a/telegraf_alpine/Dockerfile b/telegraf_alpine/Dockerfile
index 9dc3d33..8b6c340 100644
--- a/telegraf_alpine/Dockerfile
+++ b/telegraf_alpine/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.6
 
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
-RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps && \
+RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors && \
     update-ca-certificates
 
 ENV TELEGRAF_VERSION 1.7.1
diff --git a/telegraf_latest/Dockerfile b/telegraf_latest/Dockerfile
index 8f805f8..6923842 100644
--- a/telegraf_latest/Dockerfile
+++ b/telegraf_latest/Dockerfile
@@ -1,7 +1,7 @@
 FROM buildpack-deps:stretch-curl
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors && \
     rm -rf /var/lib/apt/lists/*
 
 RUN set -ex && \

@yosifkit
Copy link
Member

Build test of #4603; a1c2115; amd64 (telegraf):

$ bashbrew build telegraf:1.5
Building bashbrew/cache:ac33365070ff0a3ca6a4f737687956a59f49f8276629d1228e6ed8ea316d1f89 (telegraf:1.5)
Tagging telegraf:1.5
Tagging telegraf:1.5.3

$ test/run.sh telegraf:1.5
testing telegraf:1.5
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build telegraf:1.5-alpine
Building bashbrew/cache:9f1bb564c6489048a4ae21a4777e1fe62c91462a00093e6fb4ad7842dcf4c341 (telegraf:1.5-alpine)
Tagging telegraf:1.5-alpine
Tagging telegraf:1.5.3-alpine

$ test/run.sh telegraf:1.5-alpine
testing telegraf:1.5-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build telegraf:1.6
Building bashbrew/cache:f2bca2b2e86e4d29355762d705894ed8c9bb71c7370ddb8cd25fcadc2bc53cbf (telegraf:1.6)
Tagging telegraf:1.6
Tagging telegraf:1.6.4

$ test/run.sh telegraf:1.6
testing telegraf:1.6
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build telegraf:1.6-alpine
Building bashbrew/cache:58a67baf3349b7b55a55b0ca1e716b30b408475e73143cb0c373c5fa5635c154 (telegraf:1.6-alpine)
Tagging telegraf:1.6-alpine
Tagging telegraf:1.6.4-alpine

$ test/run.sh telegraf:1.6-alpine
testing telegraf:1.6-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build telegraf:1.7
Building bashbrew/cache:2fb84c60555383bd7f01ed403ee8fcb178ec2d0db3bd8adfede9006d27c1b81e (telegraf:1.7)
Tagging telegraf:1.7
Tagging telegraf:1.7.1
Tagging telegraf:latest

$ test/run.sh telegraf:1.7
testing telegraf:1.7
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build telegraf:1.7-alpine
Building bashbrew/cache:ef1accb20fb6181492b6a6b379ab9a6d17bad624773e047a5e9cf71f4d3d864a (telegraf:1.7-alpine)
Tagging telegraf:1.7-alpine
Tagging telegraf:1.7.1-alpine
Tagging telegraf:alpine

$ test/run.sh telegraf:1.7-alpine
testing telegraf:1.7-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@yosifkit yosifkit merged commit 54a780d into docker-library:master Jul 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants