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

Telegraf 1.19.0 #10418

Merged

Conversation

reimda
Copy link
Contributor

@reimda reimda commented Jun 24, 2021

Add the entrypoint.sh files that were missing in #10388

@github-actions
Copy link

Diff for 5d99e95:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 3a9e7d9..ccbed02 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,13 +1,6 @@
 Maintainers: David Reimschussel <dreimschussel@influxdata.com> (@reimda), Steven Soroka <ssoroka@influxdata.com> (@ssoroka)
 GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: 8e5d747ca99f0db3327e64fd68a0690aa26b4ecd
-
-Tags: 1.16, 1.16.3
-Architectures: amd64, arm32v7, arm64v8
-Directory: telegraf/1.16
-
-Tags: 1.16-alpine, 1.16.3-alpine
-Directory: telegraf/1.16/alpine
+GitCommit: 638291fd6a0d4acb8f8c8701992923bf9fc43eb1
 
 Tags: 1.17, 1.17.3
 Architectures: amd64, arm32v7, arm64v8
@@ -16,9 +9,16 @@ Directory: telegraf/1.17
 Tags: 1.17-alpine, 1.17.3-alpine
 Directory: telegraf/1.17/alpine
 
-Tags: 1.18, 1.18.3, latest
+Tags: 1.18, 1.18.3
 Architectures: amd64, arm32v7, arm64v8
 Directory: telegraf/1.18
 
-Tags: 1.18-alpine, 1.18.3-alpine, alpine
+Tags: 1.18-alpine, 1.18.3-alpine
 Directory: telegraf/1.18/alpine
+
+Tags: 1.19, 1.19.0, latest
+Architectures: amd64, arm32v7, arm64v8
+Directory: telegraf/1.19
+
+Tags: 1.19-alpine, 1.19.0-alpine, alpine
+Directory: telegraf/1.19/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 701d320..1721885 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,3 @@
-telegraf:1.16
-telegraf:1.16-alpine
-telegraf:1.16.3
-telegraf:1.16.3-alpine
 telegraf:1.17
 telegraf:1.17-alpine
 telegraf:1.17.3
@@ -10,5 +6,9 @@ telegraf:1.18
 telegraf:1.18-alpine
 telegraf:1.18.3
 telegraf:1.18.3-alpine
+telegraf:1.19
+telegraf:1.19-alpine
+telegraf:1.19.0
+telegraf:1.19.0-alpine
 telegraf:alpine
 telegraf:latest
diff --git a/telegraf_1.16.3-alpine/Dockerfile b/telegraf_1.16.3-alpine/Dockerfile
deleted file mode 100644
index 5bc724b..0000000
diff --git a/telegraf_1.16.3/Dockerfile b/telegraf_1.16.3/Dockerfile
deleted file mode 100644
index 3a84dd2..0000000
diff --git a/telegraf_alpine/Dockerfile b/telegraf_1.18.3-alpine/Dockerfile
similarity index 100%
copy from telegraf_alpine/Dockerfile
copy to telegraf_1.18.3-alpine/Dockerfile
diff --git a/telegraf_1.16.3-alpine/entrypoint.sh b/telegraf_1.18.3-alpine/entrypoint.sh
similarity index 100%
rename from telegraf_1.16.3-alpine/entrypoint.sh
rename to telegraf_1.18.3-alpine/entrypoint.sh
diff --git a/telegraf_latest/Dockerfile b/telegraf_1.18.3/Dockerfile
similarity index 100%
copy from telegraf_latest/Dockerfile
copy to telegraf_1.18.3/Dockerfile
diff --git a/telegraf_1.16.3/entrypoint.sh b/telegraf_1.18.3/entrypoint.sh
similarity index 100%
rename from telegraf_1.16.3/entrypoint.sh
rename to telegraf_1.18.3/entrypoint.sh
diff --git a/telegraf_alpine/Dockerfile b/telegraf_alpine/Dockerfile
index 2381118..2a89e9d 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.18.3
+ENV TELEGRAF_VERSION 1.19.0
 
 RUN set -ex && \
     mkdir ~/.gnupg; \
diff --git a/telegraf_latest/Dockerfile b/telegraf_latest/Dockerfile
index 045dc47..dd1be1a 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.18.3
+ENV TELEGRAF_VERSION 1.19.0
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
     case "${dpkgArch##*-}" in \
       amd64) ARCH='amd64';; \

@yosifkit yosifkit merged commit 4561e18 into docker-library:master Jun 24, 2021
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.

2 participants