Telegraf v1.15.4, v1.16.0 #8932
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff for 8621a7c:diff --git a/_bashbrew-cat b/_bashbrew-cat
index c235c8c..638a73b 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,13 +1,6 @@
-Maintainers: Jonathan A. Sternberg <jonathan@influxdata.com> (@jsternberg), Daniel Nelson <daniel.nelson@influxdata.com> (@danielnelson), David Reimschussel <dreimschussel@influxdata.com> (@reimda), Steven Soroka <ssoroka@influxdata.com> (@ssoroka)
+Maintainers: David Reimschussel <dreimschussel@influxdata.com> (@reimda), Steven Soroka <ssoroka@influxdata.com> (@ssoroka)
GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: 1f694736a634aea5fd27eca546e260460a11fd35
-
-Tags: 1.13, 1.13.4
-Architectures: amd64, arm32v7, arm64v8
-Directory: telegraf/1.13
-
-Tags: 1.13-alpine, 1.13.4-alpine
-Directory: telegraf/1.13/alpine
+GitCommit: 6c54e4334db65c91520e81e15a684d2159286729
Tags: 1.14, 1.14.5
Architectures: amd64, arm32v7, arm64v8
@@ -16,9 +9,16 @@ Directory: telegraf/1.14
Tags: 1.14-alpine, 1.14.5-alpine
Directory: telegraf/1.14/alpine
-Tags: 1.15, 1.15.3, latest
+Tags: 1.15, 1.15.4
Architectures: amd64, arm32v7, arm64v8
Directory: telegraf/1.15
-Tags: 1.15-alpine, 1.15.3-alpine, alpine
+Tags: 1.15-alpine, 1.15.4-alpine
Directory: telegraf/1.15/alpine
+
+Tags: 1.16, 1.16.0, latest
+Architectures: amd64, arm32v7, arm64v8
+Directory: telegraf/1.16
+
+Tags: 1.16-alpine, 1.16.0-alpine, alpine
+Directory: telegraf/1.16/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 030d389..2f2934c 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,14 +1,14 @@
-telegraf:1.13
-telegraf:1.13-alpine
-telegraf:1.13.4
-telegraf:1.13.4-alpine
telegraf:1.14
telegraf:1.14-alpine
telegraf:1.14.5
telegraf:1.14.5-alpine
telegraf:1.15
telegraf:1.15-alpine
-telegraf:1.15.3
-telegraf:1.15.3-alpine
+telegraf:1.15.4
+telegraf:1.15.4-alpine
+telegraf:1.16
+telegraf:1.16-alpine
+telegraf:1.16.0
+telegraf:1.16.0-alpine
telegraf:alpine
telegraf:latest
diff --git a/telegraf_1.13.4-alpine/Dockerfile b/telegraf_1.15.4-alpine/Dockerfile
similarity index 61%
rename from telegraf_1.13.4-alpine/Dockerfile
rename to telegraf_1.15.4-alpine/Dockerfile
index 5098272..74df1a0 100644
--- a/telegraf_1.13.4-alpine/Dockerfile
+++ b/telegraf_1.15.4-alpine/Dockerfile
@@ -1,12 +1,14 @@
-FROM alpine:3.12
+FROM alpine:latest
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.13.4
+ENV TELEGRAF_VERSION 1.15.4
RUN set -ex && \
+ mkdir ~/.gnupg; \
+ echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf; \
apk add --no-cache --virtual .build-deps wget gnupg tar && \
for key in \
05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
@@ -15,14 +17,14 @@ RUN set -ex && \
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
done && \
- wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \
- wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}-static_linux_amd64.tar.gz && \
- gpg --batch --verify telegraf-${TELEGRAF_VERSION}-static_linux_amd64.tar.gz.asc telegraf-${TELEGRAF_VERSION}-static_linux_amd64.tar.gz && \
+ wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz.asc && \
+ wget --no-verbose https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz && \
+ gpg --batch --verify telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz.asc telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz && \
mkdir -p /usr/src /etc/telegraf && \
- tar -C /usr/src -xzf telegraf-${TELEGRAF_VERSION}-static_linux_amd64.tar.gz && \
- mv /usr/src/telegraf*/telegraf.conf /etc/telegraf/ && \
- chmod +x /usr/src/telegraf*/* && \
- cp -a /usr/src/telegraf*/* /usr/bin/ && \
+ tar -C /usr/src -xzf telegraf-${TELEGRAF_VERSION}_static_linux_amd64.tar.gz && \
+ mv /usr/src/telegraf*/etc/telegraf/telegraf.conf /etc/telegraf/ && \
+ mkdir /etc/telegraf/telegraf.d && \
+ cp -a /usr/src/telegraf*/usr/bin/telegraf /usr/bin/ && \
gpgconf --kill all && \
rm -rf *.tar.gz* /usr/src /root/.gnupg && \
apk del .build-deps
diff --git a/telegraf_1.13.4-alpine/entrypoint.sh b/telegraf_1.15.4-alpine/entrypoint.sh
similarity index 100%
rename from telegraf_1.13.4-alpine/entrypoint.sh
rename to telegraf_1.15.4-alpine/entrypoint.sh
diff --git a/telegraf_1.13.4/Dockerfile b/telegraf_1.15.4/Dockerfile
similarity index 95%
rename from telegraf_1.13.4/Dockerfile
rename to telegraf_1.15.4/Dockerfile
index 6c42b3d..2d29735 100644
--- a/telegraf_1.13.4/Dockerfile
+++ b/telegraf_1.15.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM buildpack-deps:stretch-curl
+FROM buildpack-deps:stable-curl
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping snmp procps lm-sensors && \
@@ -15,7 +15,7 @@ RUN set -ex && \
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
done
-ENV TELEGRAF_VERSION 1.13.4
+ENV TELEGRAF_VERSION 1.15.4
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
case "${dpkgArch##*-}" in \
amd64) ARCH='amd64';; \
diff --git a/telegraf_1.13.4/entrypoint.sh b/telegraf_1.15.4/entrypoint.sh
similarity index 100%
rename from telegraf_1.13.4/entrypoint.sh
rename to telegraf_1.15.4/entrypoint.sh
diff --git a/telegraf_alpine/Dockerfile b/telegraf_alpine/Dockerfile
index d7f5311..75283ad 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.15.3
+ENV TELEGRAF_VERSION 1.16.0
RUN set -ex && \
mkdir ~/.gnupg; \
diff --git a/telegraf_latest/Dockerfile b/telegraf_latest/Dockerfile
index 6d4903e..0c8bc85 100644
--- a/telegraf_latest/Dockerfile
+++ b/telegraf_latest/Dockerfile
@@ -15,7 +15,7 @@ RUN set -ex && \
gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
done
-ENV TELEGRAF_VERSION 1.15.3
+ENV TELEGRAF_VERSION 1.16.0
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
case "${dpkgArch##*-}" in \
amd64) ARCH='amd64';; \ |
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.