From c22d44ee3f8977795dcfe3ef17c10eecd910a2fc Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 4 Nov 2019 23:12:05 +0000 Subject: [PATCH] Run update.sh --- gradle/README.md | 12 ++++++------ maven/README.md | 3 ++- nextcloud/README.md | 9 +++++++++ telegraf/README.md | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 7 deletions(-) diff --git a/gradle/README.md b/gradle/README.md index 10671e2de..e268eeb8f 100644 --- a/gradle/README.md +++ b/gradle/README.md @@ -16,12 +16,12 @@ WARNING: # Supported tags and respective `Dockerfile` links -- [`5.6.3-jdk8`, `5.6-jdk8`, `jdk8`, `5.6.3-jdk`, `5.6-jdk`, `jdk`, `5.6.3`, `5.6`, `latest`](https://github.com/keeganwitt/docker-gradle/blob/b277db699944f9fc912baa2e70ba5a13fe4963d6/jdk8/Dockerfile) -- [`5.6.3-jre8`, `5.6-jre8`, `jre8`, `5.6.3-jre`, `5.6-jre`, `jre`](https://github.com/keeganwitt/docker-gradle/blob/b277db699944f9fc912baa2e70ba5a13fe4963d6/jre8/Dockerfile) -- [`5.6.3-jdk11`, `5.6-jdk11`, `jdk11`](https://github.com/keeganwitt/docker-gradle/blob/b277db699944f9fc912baa2e70ba5a13fe4963d6/jdk11/Dockerfile) -- [`5.6.3-jre11`, `5.6-jre11`, `jre11`](https://github.com/keeganwitt/docker-gradle/blob/b277db699944f9fc912baa2e70ba5a13fe4963d6/jre11/Dockerfile) -- [`5.6.3-jdk12`, `5.6-jdk12`, `jdk12`](https://github.com/keeganwitt/docker-gradle/blob/b277db699944f9fc912baa2e70ba5a13fe4963d6/jdk12/Dockerfile) -- [`5.6.3-jre12`, `5.6-jre12`, `jre12`](https://github.com/keeganwitt/docker-gradle/blob/b277db699944f9fc912baa2e70ba5a13fe4963d6/jre12/Dockerfile) +- [`5.6.4-jdk8`, `5.6-jdk8`, `jdk8`, `5.6.4-jdk`, `5.6-jdk`, `jdk`, `5.6.4`, `5.6`, `latest`](https://github.com/keeganwitt/docker-gradle/blob/83d28ed7ef05727b883b1890fa43ed19983518e0/jdk8/Dockerfile) +- [`5.6.4-jre8`, `5.6-jre8`, `jre8`, `5.6.4-jre`, `5.6-jre`, `jre`](https://github.com/keeganwitt/docker-gradle/blob/83d28ed7ef05727b883b1890fa43ed19983518e0/jre8/Dockerfile) +- [`5.6.4-jdk11`, `5.6-jdk11`, `jdk11`](https://github.com/keeganwitt/docker-gradle/blob/83d28ed7ef05727b883b1890fa43ed19983518e0/jdk11/Dockerfile) +- [`5.6.4-jre11`, `5.6-jre11`, `jre11`](https://github.com/keeganwitt/docker-gradle/blob/83d28ed7ef05727b883b1890fa43ed19983518e0/jre11/Dockerfile) +- [`5.6.4-jdk12`, `5.6-jdk12`, `jdk12`](https://github.com/keeganwitt/docker-gradle/blob/83d28ed7ef05727b883b1890fa43ed19983518e0/jdk12/Dockerfile) +- [`5.6.4-jre12`, `5.6-jre12`, `jre12`](https://github.com/keeganwitt/docker-gradle/blob/83d28ed7ef05727b883b1890fa43ed19983518e0/jre12/Dockerfile) # Quick reference diff --git a/maven/README.md b/maven/README.md index 96ff17708..af71dad9f 100644 --- a/maven/README.md +++ b/maven/README.md @@ -16,11 +16,12 @@ WARNING: # Supported tags and respective `Dockerfile` links +- [`3.6.2-jdk-11-openj9`, `3.6-jdk-11-openj9`, `3-jdk-11-openj9`](https://github.com/carlossg/docker-maven/blob/6f912331309f5ab9745a91ef5884f3a0b46dfc1d/jdk-11-openj9/Dockerfile) - [`3.6.2-jdk-11-slim`, `3.6.2-slim`, `3.6-jdk-11-slim`, `3.6-slim`, `3-jdk-11-slim`, `slim`](https://github.com/carlossg/docker-maven/blob/081d9d041aa640694fceabc02c72fe93d5cd42cd/jdk-11-slim/Dockerfile) - [`3.6.2-jdk-11`, `3.6.2`, `3.6-jdk-11`, `3.6`, `3-jdk-11`, `3`, `latest`](https://github.com/carlossg/docker-maven/blob/081d9d041aa640694fceabc02c72fe93d5cd42cd/jdk-11/Dockerfile) -- [`3.6.2-jdk-12`, `3.6-jdk-12`, `3-jdk-12`](https://github.com/carlossg/docker-maven/blob/081d9d041aa640694fceabc02c72fe93d5cd42cd/jdk-12/Dockerfile) - [`3.6.2-jdk-13`, `3.6-jdk-13`, `3-jdk-13`](https://github.com/carlossg/docker-maven/blob/081d9d041aa640694fceabc02c72fe93d5cd42cd/jdk-13/Dockerfile) - [`3.6.2-jdk-14`, `3.6-jdk-14`, `3-jdk-14`](https://github.com/carlossg/docker-maven/blob/081d9d041aa640694fceabc02c72fe93d5cd42cd/jdk-14/Dockerfile) +- [`3.6.2-jdk-8-openj9`, `3.6-jdk-8-openj9`, `3-jdk-8-openj9`](https://github.com/carlossg/docker-maven/blob/6f912331309f5ab9745a91ef5884f3a0b46dfc1d/jdk-8-openj9/Dockerfile) - [`3.6.2-jdk-8-slim`, `3.6-jdk-8-slim`, `3-jdk-8-slim`](https://github.com/carlossg/docker-maven/blob/081d9d041aa640694fceabc02c72fe93d5cd42cd/jdk-8-slim/Dockerfile) - [`3.6.2-jdk-8`, `3.6-jdk-8`, `3-jdk-8`](https://github.com/carlossg/docker-maven/blob/081d9d041aa640694fceabc02c72fe93d5cd42cd/jdk-8/Dockerfile) - [`3.6.2-ibmjava-8-alpine`, `3.6.2-ibmjava-alpine`, `3.6-ibmjava-8-alpine`, `3.6-ibmjava-alpine`, `3-ibmjava-8-alpine`, `ibmjava-alpine`](https://github.com/carlossg/docker-maven/blob/081d9d041aa640694fceabc02c72fe93d5cd42cd/ibmjava-8-alpine/Dockerfile) diff --git a/nextcloud/README.md b/nextcloud/README.md index 399854fa5..f037d1dcf 100644 --- a/nextcloud/README.md +++ b/nextcloud/README.md @@ -16,12 +16,21 @@ WARNING: # Supported tags and respective `Dockerfile` links +- [`15.0.13RC1-apache`, `15.0.13-rc-apache`, `15.0-rc-apache`, `15-rc-apache`, `15.0.13RC1`, `15.0.13-rc`, `15.0-rc`, `15-rc`](https://github.com/nextcloud/docker/blob/ce0bb40cd97da98b6d0f89089b8b1d1a8d0bb17b/15.0-rc/apache/Dockerfile) +- [`15.0.13RC1-fpm-alpine`, `15.0.13-rc-fpm-alpine`, `15.0-rc-fpm-alpine`, `15-rc-fpm-alpine`](https://github.com/nextcloud/docker/blob/ce0bb40cd97da98b6d0f89089b8b1d1a8d0bb17b/15.0-rc/fpm-alpine/Dockerfile) +- [`15.0.13RC1-fpm`, `15.0.13-rc-fpm`, `15.0-rc-fpm`, `15-rc-fpm`](https://github.com/nextcloud/docker/blob/ce0bb40cd97da98b6d0f89089b8b1d1a8d0bb17b/15.0-rc/fpm/Dockerfile) - [`15.0.12-apache`, `15.0-apache`, `15-apache`, `15.0.12`, `15.0`, `15`](https://github.com/nextcloud/docker/blob/cee1980750dbbe1c84d321aa0169a7c033156f2c/15.0/apache/Dockerfile) - [`15.0.12-fpm-alpine`, `15.0-fpm-alpine`, `15-fpm-alpine`](https://github.com/nextcloud/docker/blob/cee1980750dbbe1c84d321aa0169a7c033156f2c/15.0/fpm-alpine/Dockerfile) - [`15.0.12-fpm`, `15.0-fpm`, `15-fpm`](https://github.com/nextcloud/docker/blob/cee1980750dbbe1c84d321aa0169a7c033156f2c/15.0/fpm/Dockerfile) +- [`16.0.6RC1-apache`, `16.0.6-rc-apache`, `16.0-rc-apache`, `16-rc-apache`, `16.0.6RC1`, `16.0.6-rc`, `16.0-rc`, `16-rc`](https://github.com/nextcloud/docker/blob/ce0bb40cd97da98b6d0f89089b8b1d1a8d0bb17b/16.0-rc/apache/Dockerfile) +- [`16.0.6RC1-fpm-alpine`, `16.0.6-rc-fpm-alpine`, `16.0-rc-fpm-alpine`, `16-rc-fpm-alpine`](https://github.com/nextcloud/docker/blob/ce0bb40cd97da98b6d0f89089b8b1d1a8d0bb17b/16.0-rc/fpm-alpine/Dockerfile) +- [`16.0.6RC1-fpm`, `16.0.6-rc-fpm`, `16.0-rc-fpm`, `16-rc-fpm`](https://github.com/nextcloud/docker/blob/ce0bb40cd97da98b6d0f89089b8b1d1a8d0bb17b/16.0-rc/fpm/Dockerfile) - [`16.0.5-apache`, `16.0-apache`, `16-apache`, `stable-apache`, `16.0.5`, `16.0`, `16`, `stable`](https://github.com/nextcloud/docker/blob/cee1980750dbbe1c84d321aa0169a7c033156f2c/16.0/apache/Dockerfile) - [`16.0.5-fpm-alpine`, `16.0-fpm-alpine`, `16-fpm-alpine`, `stable-fpm-alpine`](https://github.com/nextcloud/docker/blob/cee1980750dbbe1c84d321aa0169a7c033156f2c/16.0/fpm-alpine/Dockerfile) - [`16.0.5-fpm`, `16.0-fpm`, `16-fpm`, `stable-fpm`](https://github.com/nextcloud/docker/blob/cee1980750dbbe1c84d321aa0169a7c033156f2c/16.0/fpm/Dockerfile) +- [`17.0.1RC1-apache`, `17.0.1-rc-apache`, `17.0-rc-apache`, `17-rc-apache`, `17.0.1RC1`, `17.0.1-rc`, `17.0-rc`, `17-rc`](https://github.com/nextcloud/docker/blob/ce0bb40cd97da98b6d0f89089b8b1d1a8d0bb17b/17.0-rc/apache/Dockerfile) +- [`17.0.1RC1-fpm-alpine`, `17.0.1-rc-fpm-alpine`, `17.0-rc-fpm-alpine`, `17-rc-fpm-alpine`](https://github.com/nextcloud/docker/blob/ce0bb40cd97da98b6d0f89089b8b1d1a8d0bb17b/17.0-rc/fpm-alpine/Dockerfile) +- [`17.0.1RC1-fpm`, `17.0.1-rc-fpm`, `17.0-rc-fpm`, `17-rc-fpm`](https://github.com/nextcloud/docker/blob/ce0bb40cd97da98b6d0f89089b8b1d1a8d0bb17b/17.0-rc/fpm/Dockerfile) - [`17.0.0-apache`, `17.0-apache`, `17-apache`, `apache`, `17.0.0`, `17.0`, `17`, `latest`](https://github.com/nextcloud/docker/blob/cee1980750dbbe1c84d321aa0169a7c033156f2c/17.0/apache/Dockerfile) - [`17.0.0-fpm-alpine`, `17.0-fpm-alpine`, `17-fpm-alpine`, `fpm-alpine`](https://github.com/nextcloud/docker/blob/cee1980750dbbe1c84d321aa0169a7c033156f2c/17.0/fpm-alpine/Dockerfile) - [`17.0.0-fpm`, `17.0-fpm`, `17-fpm`, `fpm`](https://github.com/nextcloud/docker/blob/cee1980750dbbe1c84d321aa0169a7c033156f2c/17.0/fpm/Dockerfile) diff --git a/telegraf/README.md b/telegraf/README.md index b690efb4a..7dc9a58bb 100644 --- a/telegraf/README.md +++ b/telegraf/README.md @@ -258,6 +258,48 @@ $ docker run -d --name=telegraf \ Refer to the docker [plugin documentation](https://github.com/influxdata/telegraf/blob/master/plugins/inputs/docker/README.md) for more information. +### Install Additional Packages + +Some plugins require additional packages to be installed. For example, the `ntpq` plugin requires `ntpq` command. It is recommended to create a custom derivative image to install any needed commands. + +As an example this Dockerfile add the `mtr-tiny` image to the stock image and save it as `telegraf-mtr.docker`: + +```dockerfile +FROM telegraf:1.12.3 + +RUN apt-get update && apt-get install -y --no-install-recommends mtr-tiny && \ + rm -rf /var/lib/apt/lists/* +``` + +Build the derivative image: + +```console +$ docker build -t telegraf-mtr:1.12.3 - < telegraf-mtr.docker +``` + +Create a `telegraf.conf` configuration file: + +```toml +[[inputs.exec]] + interval = "60s" + commands=["mtr -C -n example.org"] + timeout = "40s" + data_format = "csv" + csv_skip_rows = 1 + csv_column_names=["", "", "status", "dest", "hop", "ip", "loss", "snt", "", "", "avg", "best", "worst", "stdev"] + name_override = "mtr" + csv_tag_columns = ["dest", "hop", "ip"] + +[[outputs.file]] + files = ["stdout"] +``` + +Run your derivative image: + +```console +$ docker run --name telegraf --rm -v $PWD/telegraf.conf:/etc/telegraf/telegraf.conf telegraf-mtr:1.12.3 +``` + # Image Variants The `telegraf` images come in many flavors, each designed for a specific use case.