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

Merged
merged 1 commit into from
Jun 14, 2019
Merged

Update telegraf image #6082

merged 1 commit into from
Jun 14, 2019

Conversation

jsternberg
Copy link
Contributor

No description provided.

@yosifkit
Copy link
Member

Diff:
warning: insecure protocol git:// detected: git://github.com/influxdata/influxdata-docker
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 351135d..b9ae298 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,11 +1,11 @@
-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:1.10.4 @ amd64
+telegraf:1.10.4 @ arm32v7
+telegraf:1.10.4 @ arm64v8
+telegraf:1.10.4-alpine @ amd64
 telegraf:alpine @ amd64
 telegraf:latest @ amd64
 telegraf:latest @ arm32v7
diff --git a/_bashbrew-list b/_bashbrew-list
index 072cb8a..e9ea443 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,3 @@
-telegraf:1.8
-telegraf:1.8-alpine
-telegraf:1.8.3
-telegraf:1.8.3-alpine
 telegraf:1.9
 telegraf:1.9-alpine
 telegraf:1.9.5
@@ -10,5 +6,9 @@ telegraf:1.10
 telegraf:1.10-alpine
 telegraf:1.10.4
 telegraf:1.10.4-alpine
+telegraf:1.11
+telegraf:1.11-alpine
+telegraf:1.11.0
+telegraf:1.11.0-alpine
 telegraf:alpine
 telegraf:latest
diff --git a/telegraf_alpine/Dockerfile b/telegraf_1.10.4-alpine/Dockerfile
similarity index 100%
copy from telegraf_alpine/Dockerfile
copy to telegraf_1.10.4-alpine/Dockerfile
diff --git a/telegraf_1.8.3-alpine/entrypoint.sh b/telegraf_1.10.4-alpine/entrypoint.sh
similarity index 100%
rename from telegraf_1.8.3-alpine/entrypoint.sh
rename to telegraf_1.10.4-alpine/entrypoint.sh
diff --git a/telegraf_latest/Dockerfile b/telegraf_1.10.4/Dockerfile
similarity index 100%
copy from telegraf_latest/Dockerfile
copy to telegraf_1.10.4/Dockerfile
diff --git a/telegraf_1.8.3/entrypoint.sh b/telegraf_1.10.4/entrypoint.sh
similarity index 100%
rename from telegraf_1.8.3/entrypoint.sh
rename to telegraf_1.10.4/entrypoint.sh
diff --git a/telegraf_1.8.3-alpine/Dockerfile b/telegraf_1.8.3-alpine/Dockerfile
deleted file mode 100644
index 1f8db69..0000000
diff --git a/telegraf_1.8.3/Dockerfile b/telegraf_1.8.3/Dockerfile
deleted file mode 100644
index 045de10..0000000
diff --git a/telegraf_alpine/Dockerfile b/telegraf_alpine/Dockerfile
index d0d2e52..8c6529c 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 tzdata && \
     update-ca-certificates
 
-ENV TELEGRAF_VERSION 1.10.4
+ENV TELEGRAF_VERSION 1.11.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 4bb0c8d..756d20d 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.10.4
+ENV TELEGRAF_VERSION 1.11.0
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
     case "${dpkgArch##*-}" in \
       amd64) ARCH='amd64';; \

@yosifkit
Copy link
Member

Build test of #6082; bb81ae8; amd64 (telegraf):

$ bashbrew build telegraf:1.9
Building bashbrew/cache:47ee306a84ad57a7cfc20cbfce3cb177304e33c856f5b174f5a9eae261768f21 (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:4c86c119e94d2dc88391f11cd88e3ab0a66b90bb1425d885406e53c0bde13dc0 (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:4042f81b9a836c73522af5e9e8e0d8e47e46f7fb44fe7efa3c20986cd0bc7adf (telegraf:1.10)
Tagging telegraf:1.10
Tagging telegraf:1.10.4

$ 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:870195c2e39bce80d1c681e9cf455448c8b4566e5f6e3c0dacd8b42fed986e6d (telegraf:1.10-alpine)
Tagging telegraf:1.10-alpine
Tagging telegraf:1.10.4-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


$ bashbrew build telegraf:1.11
Building bashbrew/cache:9b8db1f5442725dd2027880a423159be4568aa5b3007b0885978a939be51102d (telegraf:1.11)
Tagging telegraf:1.11
Tagging telegraf:1.11.0
Tagging telegraf:latest

$ test/run.sh telegraf:1.11
testing telegraf:1.11
	'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.11-alpine
Building bashbrew/cache:02acfa04e2f9f20ccce43d5f1578ee3cd9eef5d844048accb303ddf71ce07df9 (telegraf:1.11-alpine)
Tagging telegraf:1.11-alpine
Tagging telegraf:1.11.0-alpine
Tagging telegraf:alpine

$ test/run.sh telegraf:1.11-alpine
testing telegraf:1.11-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 ed35399 into docker-library:master Jun 14, 2019
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