Navigation Menu

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 influxdata images #3806

Merged
merged 1 commit into from Dec 19, 2017
Merged

Update influxdata images #3806

merged 1 commit into from Dec 19, 2017

Conversation

jsternberg
Copy link
Contributor

@jsternberg jsternberg commented Dec 14, 2017

Add a new influxdb-meta image for enterprise clusters and an enterprise
variant for influxdb so the clustering software can be used in docker.

Documentation change for influxdb-meta is included here: docker-library/docs#1097.

@tianon
Copy link
Member

tianon commented Dec 18, 2017

You might want to split out influxdb-meta into a separate PR so that the other image updates don't get held up longer by the new-image-review queue (which is a tad on the long end right now, unfortunately). 😉

@tianon
Copy link
Member

tianon commented Dec 19, 2017

Another option would be to just use meta-xxx tags on the influxdb image, if this new thing is always used with influxdb (and is rarely used standalone), or to put it under influxdb/meta or influxdata/meta.

@jsternberg
Copy link
Contributor Author

I think I'm going to split it up so the telegraf stuff doesn't get delayed, but we're unsure what to do with the meta image. The reason why I put it into a separate image is there isn't much in common with the influxdb image itself other than the software is always run with the influxdb:enterprise image and so it didn't seem worth it to start having tags like influxdb:1.3-meta-alpine although I guess we would get that weird tag naming with the enterprise image too.

@tianon
Copy link
Member

tianon commented Dec 19, 2017

It might be worth looking at the naming for the cli variants of the wordpress image -- wp-cli is included there, but they don't share much in common with the main WordPress image:

$ bashbrew list wordpress:cli
wordpress:cli-1.4.1
wordpress:cli-1.4
wordpress:cli-1
wordpress:cli
wordpress:cli-1.4.1-php7.2
wordpress:cli-1.4-php7.2
wordpress:cli-1-php7.2
wordpress:cli-php7.2

vs

$ bashbrew list wordpress:latest
wordpress:4.9.1-apache
wordpress:4.9-apache
wordpress:4-apache
wordpress:apache
wordpress:4.9.1
wordpress:4.9
wordpress:4
wordpress:latest
wordpress:4.9.1-php7.2-apache
wordpress:4.9-php7.2-apache
wordpress:4-php7.2-apache
wordpress:php7.2-apache
wordpress:4.9.1-php7.2
wordpress:4.9-php7.2
wordpress:4-php7.2
wordpress:php7.2

@jsternberg
Copy link
Contributor Author

I've updated this PR for only the telegraf image update. It seems like my initial fear is likely not a big deal so we're going to discuss changing the name of the enterprise images to data and meta variants.

@tianon
Copy link
Member

tianon commented Dec 19, 2017

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 58fa152..2057e72 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -2,6 +2,10 @@ telegraf:1.3.5 @ amd64
 telegraf:1.3.5 @ arm32v7
 telegraf:1.3.5 @ arm64v8
 telegraf:1.3.5-alpine @ amd64
+telegraf:1.4.5 @ amd64
+telegraf:1.4.5 @ arm32v7
+telegraf:1.4.5 @ arm64v8
+telegraf:1.4.5-alpine @ amd64
 telegraf:alpine @ amd64
 telegraf:latest @ amd64
 telegraf:latest @ arm32v7
diff --git a/_bashbrew-list b/_bashbrew-list
index a181967..3d14837 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,5 +6,9 @@ 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.0
+telegraf:1.5.0-alpine
 telegraf:alpine
 telegraf:latest
diff --git a/telegraf_alpine/Dockerfile b/telegraf_1.4.5-alpine/Dockerfile
similarity index 100%
copy from telegraf_alpine/Dockerfile
copy to telegraf_1.4.5-alpine/Dockerfile
diff --git a/telegraf_1.3.5-alpine/entrypoint.sh b/telegraf_1.4.5-alpine/entrypoint.sh
similarity index 100%
copy from telegraf_1.3.5-alpine/entrypoint.sh
copy to telegraf_1.4.5-alpine/entrypoint.sh
diff --git a/telegraf_latest/Dockerfile b/telegraf_1.4.5/Dockerfile
similarity index 100%
copy from telegraf_latest/Dockerfile
copy to telegraf_1.4.5/Dockerfile
diff --git a/telegraf_1.3.5/entrypoint.sh b/telegraf_1.4.5/entrypoint.sh
similarity index 100%
copy from telegraf_1.3.5/entrypoint.sh
copy to telegraf_1.4.5/entrypoint.sh
diff --git a/telegraf_alpine/Dockerfile b/telegraf_alpine/Dockerfile
index 231cb24..06529c6 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.4.5
+ENV TELEGRAF_VERSION 1.5.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 e6093c6..5674666 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.4.5
+ENV TELEGRAF_VERSION 1.5.0
 RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
     case "${dpkgArch##*-}" in \
       amd64) ARCH='amd64';; \

@tianon
Copy link
Member

tianon commented Dec 19, 2017

LGTM

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

$ bashbrew build telegraf:1.3
Building bashbrew/cache:9a60e0de05a43d4e867a866e2773378192a8d70cdcb128ecc4db3d35e2231f6a (telegraf:1.3)
Tagging telegraf:1.3
Tagging telegraf:1.3.5

$ test/run.sh telegraf:1.3
testing telegraf:1.3
	'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.3-alpine
Building bashbrew/cache:0cdf14fac85a0d871ca452c8a938f13c8b5cee0f43cb3cb967999de3c2f49e09 (telegraf:1.3-alpine)
Tagging telegraf:1.3-alpine
Tagging telegraf:1.3.5-alpine

$ test/run.sh telegraf:1.3-alpine
testing telegraf:1.3-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.4
Building bashbrew/cache:13da947134a7e32f0e1c427a808f03c1426856b998d71af295a565b4afa2b4c6 (telegraf:1.4)
Tagging telegraf:1.4
Tagging telegraf:1.4.5

$ test/run.sh telegraf:1.4
testing telegraf:1.4
	'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.4-alpine
Building bashbrew/cache:03a4251e0321c2dfb4cfc497ce8456b312549422182971a76e17a9d666de5beb (telegraf:1.4-alpine)
Tagging telegraf:1.4-alpine
Tagging telegraf:1.4.5-alpine

$ test/run.sh telegraf:1.4-alpine
testing telegraf:1.4-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.5
Building bashbrew/cache:6260d327cce019537499a20f0bd7cc68c18f7d7e5a8c3f7c71dc79ca15bc221b (telegraf:1.5)
Tagging telegraf:1.5
Tagging telegraf:1.5.0
Tagging telegraf:latest

$ 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:b64f5bf5d1b33765728064b1a4439987a200d4d8dfc514e685cfa3351f8a0b77 (telegraf:1.5-alpine)
Tagging telegraf:1.5-alpine
Tagging telegraf:1.5.0-alpine
Tagging telegraf: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

@tianon tianon merged commit ae1ebcd into docker-library:master Dec 19, 2017
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.

None yet

3 participants