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 #4455

Merged
merged 1 commit into from
Jun 14, 2018
Merged

Update telegraf image #4455

merged 1 commit into from
Jun 14, 2018

Conversation

jsternberg
Copy link
Contributor

No description provided.

@tianon
Copy link
Member

tianon commented Jun 14, 2018

Diff:
warning: insecure protocol git:// detected: git://github.com/influxdata/influxdata-docker
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 14f2264..3033834 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,11 +1,11 @@
-telegraf:1.4.5 @ amd64
-telegraf:1.4.5 @ arm32v7
-telegraf:1.4.5 @ arm64v8
-telegraf:1.4.5-alpine @ amd64
 telegraf:1.5.3 @ amd64
 telegraf:1.5.3 @ arm32v7
 telegraf:1.5.3 @ arm64v8
 telegraf:1.5.3-alpine @ amd64
+telegraf:1.6.4 @ amd64
+telegraf:1.6.4 @ arm32v7
+telegraf:1.6.4 @ arm64v8
+telegraf:1.6.4-alpine @ amd64
 telegraf:alpine @ amd64
 telegraf:latest @ amd64
 telegraf:latest @ arm32v7
diff --git a/_bashbrew-list b/_bashbrew-list
index ff09049..a0ff510 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,3 @@
-telegraf:1.4
-telegraf:1.4-alpine
-telegraf:1.4.5
-telegraf:1.4.5-alpine
 telegraf:1.5
 telegraf:1.5-alpine
 telegraf:1.5.3
@@ -10,5 +6,9 @@ telegraf:1.6
 telegraf:1.6-alpine
 telegraf:1.6.4
 telegraf:1.6.4-alpine
+telegraf:1.7
+telegraf:1.7-alpine
+telegraf:1.7.0
+telegraf:1.7.0-alpine
 telegraf:alpine
 telegraf:latest
diff --git a/telegraf_1.4.5-alpine/Dockerfile b/telegraf_1.4.5-alpine/Dockerfile
deleted file mode 100644
index 653c87f..0000000
diff --git a/telegraf_1.4.5/Dockerfile b/telegraf_1.4.5/Dockerfile
deleted file mode 100644
index 2c1ee30..0000000
diff --git a/telegraf_alpine/Dockerfile b/telegraf_1.6.4-alpine/Dockerfile
similarity index 100%
copy from telegraf_alpine/Dockerfile
copy to telegraf_1.6.4-alpine/Dockerfile
diff --git a/telegraf_1.4.5-alpine/entrypoint.sh b/telegraf_1.6.4-alpine/entrypoint.sh
similarity index 100%
rename from telegraf_1.4.5-alpine/entrypoint.sh
rename to telegraf_1.6.4-alpine/entrypoint.sh
diff --git a/telegraf_latest/Dockerfile b/telegraf_1.6.4/Dockerfile
similarity index 100%
copy from telegraf_latest/Dockerfile
copy to telegraf_1.6.4/Dockerfile
diff --git a/telegraf_1.4.5/entrypoint.sh b/telegraf_1.6.4/entrypoint.sh
similarity index 100%
rename from telegraf_1.4.5/entrypoint.sh
rename to telegraf_1.6.4/entrypoint.sh
diff --git a/telegraf_alpine/Dockerfile b/telegraf_alpine/Dockerfile
index 5d4e446..235ecca 100644
--- a/telegraf_alpine/Dockerfile
+++ b/telegraf_alpine/Dockerfile
@@ -4,7 +4,7 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps && \
     update-ca-certificates
 
-ENV TELEGRAF_VERSION 1.6.4
+ENV TELEGRAF_VERSION 1.7.0
 
 RUN set -ex && \
     apk add --no-cache --virtual .build-deps wget gnupg tar && \
diff --git a/telegraf_latest/Dockerfile b/telegraf_latest/Dockerfile
index 81666fd..fc5701f 100644
--- a/telegraf_latest/Dockerfile
+++ b/telegraf_latest/Dockerfile
@@ -13,7 +13,7 @@ RUN set -ex && \
         gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
     done
 
-ENV TELEGRAF_VERSION 1.6.4
+ENV TELEGRAF_VERSION 1.7.0
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
     case "${dpkgArch##*-}" in \
       amd64) ARCH='amd64';; \

@tianon
Copy link
Member

tianon commented Jun 14, 2018

LGTM

Build test of #4455; b8f09dd; amd64 (telegraf):
warning: insecure protocol git:// detected: git://github.com/influxdata/influxdata-docker

$ bashbrew build telegraf:1.5
Building bashbrew/cache:0e5a71274b9c46945f6677b5336389819ee598629b1bcd0812980cb3e2dfe254 (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:3b1d664f241c15b2f0f3b8a36dfced492b16351fc8a9bdba4af9fd616770e602 (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:14caf8b6fbc7dac41be840464ff42640868642c9655d01c44178c9b57fb1fe61 (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:2efdb80068b75d2fe844f6b378e2204112abf880ef37d3d109c576e8746f8d27 (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:4f556f5761349e8a414a978ec239ce2cd0d1d05f282468ddf3b8dcebc314df78 (telegraf:1.7)
Tagging telegraf:1.7
Tagging telegraf:1.7.0
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:bd31aa403d0dd1d12a10ae4717d9955e6095b6ee3a4e756af1dd6e8d6cc8877f (telegraf:1.7-alpine)
Tagging telegraf:1.7-alpine
Tagging telegraf:1.7.0-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

@tianon tianon merged commit 735c177 into docker-library:master Jun 14, 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