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

Merged
merged 1 commit into from Mar 7, 2019

Conversation

Projects
None yet
3 participants
@jsternberg
Copy link
Contributor

jsternberg commented Mar 6, 2019

No description provided.

@tianon

This comment has been minimized.

Copy link
Member

tianon commented Mar 7, 2019

Diff:
warning: insecure protocol git:// detected: git://github.com/influxdata/influxdata-docker
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 4e70378..351135d 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,11 +1,11 @@
-telegraf:1.7.4 @ amd64
-telegraf:1.7.4 @ arm32v7
-telegraf:1.7.4 @ arm64v8
-telegraf:1.7.4-alpine @ amd64
 telegraf:1.8.3 @ amd64
 telegraf:1.8.3 @ arm32v7
 telegraf:1.8.3 @ arm64v8
 telegraf:1.8.3-alpine @ amd64
+telegraf:1.9.5 @ amd64
+telegraf:1.9.5 @ arm32v7
+telegraf:1.9.5 @ arm64v8
+telegraf:1.9.5-alpine @ amd64
 telegraf:alpine @ amd64
 telegraf:latest @ amd64
 telegraf:latest @ arm32v7
diff --git a/_bashbrew-list b/_bashbrew-list
index 7836743..e197505 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,3 @@
-telegraf:1.7
-telegraf:1.7-alpine
-telegraf:1.7.4
-telegraf:1.7.4-alpine
 telegraf:1.8
 telegraf:1.8-alpine
 telegraf:1.8.3
@@ -10,5 +6,9 @@ telegraf:1.9
 telegraf:1.9-alpine
 telegraf:1.9.5
 telegraf:1.9.5-alpine
+telegraf:1.10
+telegraf:1.10-alpine
+telegraf:1.10.0
+telegraf:1.10.0-alpine
 telegraf:alpine
 telegraf:latest
diff --git a/telegraf_1.7.4-alpine/Dockerfile b/telegraf_1.7.4-alpine/Dockerfile
deleted file mode 100644
index f680fe7..0000000
diff --git a/telegraf_1.7.4/Dockerfile b/telegraf_1.7.4/Dockerfile
deleted file mode 100644
index 997d413..0000000
diff --git a/telegraf_alpine/Dockerfile b/telegraf_1.9.5-alpine/Dockerfile
similarity index 100%
copy from telegraf_alpine/Dockerfile
copy to telegraf_1.9.5-alpine/Dockerfile
diff --git a/telegraf_1.7.4-alpine/entrypoint.sh b/telegraf_1.9.5-alpine/entrypoint.sh
similarity index 100%
rename from telegraf_1.7.4-alpine/entrypoint.sh
rename to telegraf_1.9.5-alpine/entrypoint.sh
diff --git a/telegraf_latest/Dockerfile b/telegraf_1.9.5/Dockerfile
similarity index 100%
copy from telegraf_latest/Dockerfile
copy to telegraf_1.9.5/Dockerfile
diff --git a/telegraf_1.7.4/entrypoint.sh b/telegraf_1.9.5/entrypoint.sh
similarity index 100%
rename from telegraf_1.7.4/entrypoint.sh
rename to telegraf_1.9.5/entrypoint.sh
diff --git a/telegraf_alpine/Dockerfile b/telegraf_alpine/Dockerfile
index 721b1ba..5a91e3b 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 lm_sensors && \
     update-ca-certificates
 
-ENV TELEGRAF_VERSION 1.9.5
+ENV TELEGRAF_VERSION 1.10.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 9671170..03bce9d 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.9.5
+ENV TELEGRAF_VERSION 1.10.0
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
     case "${dpkgArch##*-}" in \
       amd64) ARCH='amd64';; \
@tianon

This comment has been minimized.

Copy link
Member

tianon commented Mar 7, 2019

LGTM

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

$ bashbrew build telegraf:1.8
Building bashbrew/cache:c2504e86f9018074fb5ff0366e215608f86c6e634bdae003738c5451fd2bc2d0 (telegraf:1.8)
Tagging telegraf:1.8
Tagging telegraf:1.8.3

$ test/run.sh telegraf:1.8
testing telegraf:1.8
	'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.8-alpine
Building bashbrew/cache:972f49c963a25f93eecac9a7f80f527d15fc75b64216a132e463dbd7f5e0f3f4 (telegraf:1.8-alpine)
Tagging telegraf:1.8-alpine
Tagging telegraf:1.8.3-alpine

$ test/run.sh telegraf:1.8-alpine
testing telegraf:1.8-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.9
Building bashbrew/cache:cbf649e050ff377579431674165339dfbedc33027d8becaa7dcb7f7e09936883 (telegraf:1.9)
Tagging telegraf:1.9
Tagging telegraf:1.9.5

$ test/run.sh telegraf:1.9
testing telegraf:1.9
	'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.9-alpine
Building bashbrew/cache:ee06f0b99ee9ae163a241fc9a37d0d406dd35a041bbe059c634f7e1c979db696 (telegraf:1.9-alpine)
Tagging telegraf:1.9-alpine
Tagging telegraf:1.9.5-alpine

$ test/run.sh telegraf:1.9-alpine
testing telegraf:1.9-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.10
Building bashbrew/cache:c6a5aa70091c96d4dd3516d917151819bce1995d16ce472997921aefdf29ef9e (telegraf:1.10)
Tagging telegraf:1.10
Tagging telegraf:1.10.0
Tagging telegraf:latest

$ test/run.sh telegraf:1.10
testing telegraf:1.10
	'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.10-alpine
Building bashbrew/cache:e19120acf300178d9ff0334c099910ddd8b574d6b2c2d5bbf36ec08983d2b789 (telegraf:1.10-alpine)
Tagging telegraf:1.10-alpine
Tagging telegraf:1.10.0-alpine
Tagging telegraf:alpine

$ test/run.sh telegraf:1.10-alpine
testing telegraf:1.10-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 c134814 into docker-library:master Mar 7, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.