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.3.0 and smaller chronograf image #2961

Merged
merged 1 commit into from
May 16, 2017

Conversation

jsternberg
Copy link
Contributor

Update chronograf, influxdb, kapacitor, and telegraf so they check
multiple gpg servers for a key rather than failing if the keyserver
fails. This should make the builds more reliable.

Update chronograf, influxdb, kapacitor, and telegraf so they check
multiple gpg servers for a key rather than failing if the keyserver
fails. This should make the builds more reliable.

chronograf is updated to use jessie-slim so the image will be smaller.
If this works out well, we'll be following the same pattern with the
other images. This also updates the license documentation within the
chronograf image.
@jsternberg jsternberg changed the title telegraf 1.3.0 telegraf 1.3.0 and smaller chronograf image May 16, 2017
@yosifkit
Copy link
Member

Diff:
warning: insecure protocol git:// detected: git://github.com/influxdata/influxdata-docker
diff --git a/_bashbrew-list b/_bashbrew-list
index 38171ad..ee3f819 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -24,13 +24,13 @@ kapacitor:1.2.1
 kapacitor:1.2.1-alpine
 kapacitor:alpine
 kapacitor:latest
-telegraf:1.1
-telegraf:1.1-alpine
-telegraf:1.1.2
-telegraf:1.1.2-alpine
 telegraf:1.2
 telegraf:1.2-alpine
 telegraf:1.2.1
 telegraf:1.2.1-alpine
+telegraf:1.3
+telegraf:1.3-alpine
+telegraf:1.3.0
+telegraf:1.3.0-alpine
 telegraf:alpine
 telegraf:latest
diff --git a/chronograf_alpine/Dockerfile b/chronograf_alpine/Dockerfile
index 4130e2a..69b5a37 100644
--- a/chronograf_alpine/Dockerfile
+++ b/chronograf_alpine/Dockerfile
@@ -6,9 +6,15 @@ RUN apk add --no-cache ca-certificates && \
 
 ENV CHRONOGRAF_VERSION 1.3.0
 
-RUN apk add --no-cache --virtual .build-deps wget gnupg tar && \
-    gpg --keyserver hkp://ha.pool.sks-keyservers.net \
-        --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
+RUN set -ex && \
+    apk add --no-cache --virtual .build-deps wget gnupg tar && \
+    for key in \
+        05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
+    do \
+        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
+        gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
+        gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
+    done && \
     wget -q https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \
     wget -q https://dl.influxdata.com/chronograf/releases/chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz.asc chronograf-${CHRONOGRAF_VERSION}-static_linux_amd64.tar.gz && \
diff --git a/chronograf_latest/Dockerfile b/chronograf_latest/Dockerfile
index 854d37d..12c7629 100644
--- a/chronograf_latest/Dockerfile
+++ b/chronograf_latest/Dockerfile
@@ -1,15 +1,25 @@
-FROM buildpack-deps:jessie-curl
+FROM debian:jessie-slim
 
-RUN gpg \
-    --keyserver hkp://ha.pool.sks-keyservers.net \
-    --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
+RUN set -ex && \
+    for key in \
+        05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
+    do \
+        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
+        gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
+        gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
+    done
 
 ENV CHRONOGRAF_VERSION 1.3.0
-RUN wget -q https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_amd64.deb.asc && \
-    wget -q https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_amd64.deb && \
+RUN buildDeps='curl' \
+    set -x && \
+    apt-get update && apt-get install -y ca-certificates $buildDeps --no-install-recommends && \
+    rm -rf /var/lib/apt/lists/* && \
+    curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_amd64.deb.asc" && \
+    curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_amd64.deb" && \
     gpg --batch --verify chronograf_${CHRONOGRAF_VERSION}_amd64.deb.asc chronograf_${CHRONOGRAF_VERSION}_amd64.deb && \
     dpkg -i chronograf_${CHRONOGRAF_VERSION}_amd64.deb && \
-    rm -f chronograf_${CHRONOGRAF_VERSION}_amd64.deb*
+    rm -f chronograf_${CHRONOGRAF_VERSION}_amd64.deb* && \
+    apt-get purge -y --auto-remove $buildDeps
 
 COPY LICENSE /usr/share/chronograf/LICENSE
 COPY agpl-3.0.md /usr/share/chronograf/agpl-3.0.md
diff --git a/chronograf_latest/LICENSE b/chronograf_latest/LICENSE
index 9ffd67f..fa74759 100644
--- a/chronograf_latest/LICENSE
+++ b/chronograf_latest/LICENSE
@@ -17,12 +17,11 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 InfluxData Inc.
-150 Spear Street
-Suite 1750
-San Francisco, CA 94105
-contact@influxdata.com                   
-                    
-                    
+799 Market Street, Suite 400
+San Francisco, CA 94103
+contact@influxdata.com
+
+
                     GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
 
diff --git a/influxdb_1.1.5-alpine/Dockerfile b/influxdb_1.1.5-alpine/Dockerfile
index e2adbd3..35cec79 100644
--- a/influxdb_1.1.5-alpine/Dockerfile
+++ b/influxdb_1.1.5-alpine/Dockerfile
@@ -3,10 +3,16 @@ FROM alpine:3.5
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 
 ENV INFLUXDB_VERSION 1.1.5
-RUN apk add --no-cache --virtual .build-deps wget gnupg tar ca-certificates && \
+RUN set -ex && \
+    apk add --no-cache --virtual .build-deps wget gnupg tar ca-certificates && \
     update-ca-certificates && \
-    gpg --keyserver hkp://ha.pool.sks-keyservers.net \
-        --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
+    for key in \
+        05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
+    do \
+        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
+        gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
+        gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
+    done && \
     wget -q https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \
     wget -q https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
diff --git a/influxdb_1.1.5/Dockerfile b/influxdb_1.1.5/Dockerfile
index 379c2c9..86499a5 100644
--- a/influxdb_1.1.5/Dockerfile
+++ b/influxdb_1.1.5/Dockerfile
@@ -1,8 +1,13 @@
 FROM buildpack-deps:jessie-curl
 
-RUN gpg \
-    --keyserver hkp://ha.pool.sks-keyservers.net \
-    --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
+RUN set -ex && \
+    for key in \
+        05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
+    do \
+        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
+        gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
+        gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
+    done
 
 ENV INFLUXDB_VERSION 1.1.5
 RUN wget -q https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_amd64.deb.asc && \
diff --git a/influxdb_alpine/Dockerfile b/influxdb_alpine/Dockerfile
index 9c14cc0..3856e61 100644
--- a/influxdb_alpine/Dockerfile
+++ b/influxdb_alpine/Dockerfile
@@ -3,10 +3,16 @@ FROM alpine:3.5
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 
 ENV INFLUXDB_VERSION 1.2.4
-RUN apk add --no-cache --virtual .build-deps wget gnupg tar ca-certificates && \
+RUN set -ex && \
+    apk add --no-cache --virtual .build-deps wget gnupg tar ca-certificates && \
     update-ca-certificates && \
-    gpg --keyserver hkp://ha.pool.sks-keyservers.net \
-        --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
+    for key in \
+        05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
+    do \
+        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
+        gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
+        gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
+    done && \
     wget -q https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc && \
     wget -q https://dl.influxdata.com/influxdb/releases/influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz.asc influxdb-${INFLUXDB_VERSION}-static_linux_amd64.tar.gz && \
diff --git a/influxdb_latest/Dockerfile b/influxdb_latest/Dockerfile
index d083e52..b590d73 100644
--- a/influxdb_latest/Dockerfile
+++ b/influxdb_latest/Dockerfile
@@ -1,8 +1,13 @@
 FROM buildpack-deps:jessie-curl
 
-RUN gpg \
-    --keyserver hkp://ha.pool.sks-keyservers.net \
-    --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
+RUN set -ex && \
+    for key in \
+        05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
+    do \
+        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
+        gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
+        gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
+    done
 
 ENV INFLUXDB_VERSION 1.2.4
 RUN wget -q https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_amd64.deb.asc && \
diff --git a/kapacitor_1.1.1-alpine/Dockerfile b/kapacitor_1.1.1-alpine/Dockerfile
index 9655f18..ca75a81 100644
--- a/kapacitor_1.1.1-alpine/Dockerfile
+++ b/kapacitor_1.1.1-alpine/Dockerfile
@@ -6,9 +6,15 @@ RUN apk add --no-cache ca-certificates && \
 
 ENV KAPACITOR_VERSION 1.1.1
 
-RUN apk add --no-cache --virtual .build-deps wget gnupg tar && \
-    gpg --keyserver hkp://ha.pool.sks-keyservers.net \
-        --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
+RUN set -ex && \
+    apk add --no-cache --virtual .build-deps wget gnupg tar && \
+    for key in \
+        05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
+    do \
+        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
+        gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
+        gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
+    done && \
     wget -q https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc && \
     wget -q https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
diff --git a/kapacitor_1.1.1/Dockerfile b/kapacitor_1.1.1/Dockerfile
index 0b89a80..ac941a7 100644
--- a/kapacitor_1.1.1/Dockerfile
+++ b/kapacitor_1.1.1/Dockerfile
@@ -1,8 +1,13 @@
 FROM buildpack-deps:jessie-curl
 
-RUN gpg \
-    --keyserver hkp://ha.pool.sks-keyservers.net \
-    --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
+RUN set -ex && \
+    for key in \
+        05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
+    do \
+        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
+        gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
+        gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
+    done
 
 ENV KAPACITOR_VERSION 1.1.1
 RUN wget -q https://dl.influxdata.com/kapacitor/releases/kapacitor_${KAPACITOR_VERSION}_amd64.deb.asc && \
diff --git a/kapacitor_alpine/Dockerfile b/kapacitor_alpine/Dockerfile
index 5baf803..58bcd64 100644
--- a/kapacitor_alpine/Dockerfile
+++ b/kapacitor_alpine/Dockerfile
@@ -6,9 +6,15 @@ RUN apk add --no-cache ca-certificates && \
 
 ENV KAPACITOR_VERSION 1.2.1
 
-RUN apk add --no-cache --virtual .build-deps wget gnupg tar && \
-    gpg --keyserver hkp://ha.pool.sks-keyservers.net \
-        --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
+RUN set -ex && \
+    apk add --no-cache --virtual .build-deps wget gnupg tar && \
+    for key in \
+        05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
+    do \
+        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
+        gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
+        gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
+    done && \
     wget -q https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc && \
     wget -q https://dl.influxdata.com/kapacitor/releases/kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
     gpg --batch --verify kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz.asc kapacitor-${KAPACITOR_VERSION}-static_linux_amd64.tar.gz && \
diff --git a/kapacitor_latest/Dockerfile b/kapacitor_latest/Dockerfile
index 313a785..eb510cc 100644
--- a/kapacitor_latest/Dockerfile
+++ b/kapacitor_latest/Dockerfile
@@ -1,8 +1,13 @@
 FROM buildpack-deps:jessie-curl
 
-RUN gpg \
-    --keyserver hkp://ha.pool.sks-keyservers.net \
-    --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
+RUN set -ex && \
+    for key in \
+        05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
+    do \
+        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
+        gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
+        gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
+    done
 
 ENV KAPACITOR_VERSION 1.2.1
 RUN wget -q https://dl.influxdata.com/kapacitor/releases/kapacitor_${KAPACITOR_VERSION}_amd64.deb.asc && \
diff --git a/telegraf_1.1.2-alpine/Dockerfile b/telegraf_1.2.1-alpine/Dockerfile
similarity index 71%
rename from telegraf_1.1.2-alpine/Dockerfile
rename to telegraf_1.2.1-alpine/Dockerfile
index 44287e9..32f7ebf 100644
--- a/telegraf_1.1.2-alpine/Dockerfile
+++ b/telegraf_1.2.1-alpine/Dockerfile
@@ -4,11 +4,17 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 RUN apk add --no-cache iputils ca-certificates && \
     update-ca-certificates
 
-ENV TELEGRAF_VERSION 1.1.2
+ENV TELEGRAF_VERSION 1.2.1
 
-RUN apk add --no-cache --virtual .build-deps wget gnupg tar && \
-    gpg --keyserver hkp://ha.pool.sks-keyservers.net \
-        --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
+RUN set -ex && \
+    apk add --no-cache --virtual .build-deps wget gnupg tar && \
+    for key in \
+        05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
+    do \
+        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
+        gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
+        gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
+    done && \
     wget -q https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \
     wget -q 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 && \
diff --git a/telegraf_1.1.2-alpine/entrypoint.sh b/telegraf_1.2.1-alpine/entrypoint.sh
similarity index 100%
rename from telegraf_1.1.2-alpine/entrypoint.sh
rename to telegraf_1.2.1-alpine/entrypoint.sh
diff --git a/telegraf_1.1.2/Dockerfile b/telegraf_1.2.1/Dockerfile
similarity index 63%
rename from telegraf_1.1.2/Dockerfile
rename to telegraf_1.2.1/Dockerfile
index 8e1ffce..e91c3c1 100644
--- a/telegraf_1.1.2/Dockerfile
+++ b/telegraf_1.2.1/Dockerfile
@@ -1,10 +1,15 @@
 FROM buildpack-deps:trusty-curl
 
-RUN gpg \
-    --keyserver hkp://ha.pool.sks-keyservers.net \
-    --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
+RUN set -ex && \
+    for key in \
+        05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
+    do \
+        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
+        gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
+        gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
+    done
 
-ENV TELEGRAF_VERSION 1.1.2
+ENV TELEGRAF_VERSION 1.2.1
 RUN wget -q https://dl.influxdata.com/telegraf/releases/telegraf_${TELEGRAF_VERSION}_amd64.deb.asc && \
     wget -q https://dl.influxdata.com/telegraf/releases/telegraf_${TELEGRAF_VERSION}_amd64.deb && \
     gpg --batch --verify telegraf_${TELEGRAF_VERSION}_amd64.deb.asc telegraf_${TELEGRAF_VERSION}_amd64.deb && \
diff --git a/telegraf_1.1.2/entrypoint.sh b/telegraf_1.2.1/entrypoint.sh
similarity index 100%
rename from telegraf_1.1.2/entrypoint.sh
rename to telegraf_1.2.1/entrypoint.sh
diff --git a/telegraf_alpine/Dockerfile b/telegraf_alpine/Dockerfile
index b16f10b..6fe45e4 100644
--- a/telegraf_alpine/Dockerfile
+++ b/telegraf_alpine/Dockerfile
@@ -4,11 +4,17 @@ RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 RUN apk add --no-cache iputils ca-certificates && \
     update-ca-certificates
 
-ENV TELEGRAF_VERSION 1.2.1
+ENV TELEGRAF_VERSION 1.3.0
 
-RUN apk add --no-cache --virtual .build-deps wget gnupg tar && \
-    gpg --keyserver hkp://ha.pool.sks-keyservers.net \
-        --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5 && \
+RUN set -ex && \
+    apk add --no-cache --virtual .build-deps wget gnupg tar && \
+    for key in \
+        05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
+    do \
+        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
+        gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
+        gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
+    done && \
     wget -q https://dl.influxdata.com/telegraf/releases/telegraf-${TELEGRAF_VERSION}-static_linux_amd64.tar.gz.asc && \
     wget -q 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 && \
diff --git a/telegraf_latest/Dockerfile b/telegraf_latest/Dockerfile
index 9ca3ddc..a0dc2b5 100644
--- a/telegraf_latest/Dockerfile
+++ b/telegraf_latest/Dockerfile
@@ -1,15 +1,20 @@
 FROM buildpack-deps:trusty-curl
 
-RUN gpg \
-    --keyserver hkp://ha.pool.sks-keyservers.net \
-    --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
+RUN set -ex && \
+    for key in \
+        05CE15085FC09D18E99EFB22684A14CF2582E0C5 ; \
+    do \
+        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \
+        gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
+        gpg --keyserver keyserver.pgp.com --recv-keys "$key" ; \
+    done
 
-ENV TELEGRAF_VERSION 1.2.1
-RUN wget -q https://dl.influxdata.com/telegraf/releases/telegraf_${TELEGRAF_VERSION}_amd64.deb.asc && \
-    wget -q https://dl.influxdata.com/telegraf/releases/telegraf_${TELEGRAF_VERSION}_amd64.deb && \
-    gpg --batch --verify telegraf_${TELEGRAF_VERSION}_amd64.deb.asc telegraf_${TELEGRAF_VERSION}_amd64.deb && \
-    dpkg -i telegraf_${TELEGRAF_VERSION}_amd64.deb && \
-    rm -f telegraf_${TELEGRAF_VERSION}_amd64.deb*
+ENV TELEGRAF_VERSION 1.3.0
+RUN wget -q https://dl.influxdata.com/telegraf/releases/telegraf_${TELEGRAF_VERSION}-1_amd64.deb.asc && \
+    wget -q https://dl.influxdata.com/telegraf/releases/telegraf_${TELEGRAF_VERSION}-1_amd64.deb && \
+    gpg --batch --verify telegraf_${TELEGRAF_VERSION}-1_amd64.deb.asc telegraf_${TELEGRAF_VERSION}-1_amd64.deb && \
+    dpkg -i telegraf_${TELEGRAF_VERSION}-1_amd64.deb && \
+    rm -f telegraf_${TELEGRAF_VERSION}-1_amd64.deb*
 
 EXPOSE 8125/udp 8092/udp 8094
 

@yosifkit
Copy link
Member

Build test of #2961; 33b0fda (chronograf, influxdb, kapacitor, telegraf):

$ bashbrew build chronograf:1.3
Building bashbrew/cache:04ae2463600e06b77127abec9e67fe3a992de8f20751a93c48c192ae22092f3b (chronograf:1.3)
Tagging chronograf:1.3
Tagging chronograf:1.3.0
Tagging chronograf:latest

$ test/run.sh chronograf:1.3
testing chronograf: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 chronograf:1.3-alpine
Building bashbrew/cache:d7b5883f4bf66c6c6668919c742fa3f78293d5b1cff7568cdf5f222b5524140e (chronograf:1.3-alpine)
Tagging chronograf:1.3-alpine
Tagging chronograf:1.3.0-alpine
Tagging chronograf:alpine

$ test/run.sh chronograf:1.3-alpine
testing chronograf: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 influxdb:1.1
Building bashbrew/cache:a1ce30484a7fe8f50b5d2bb03c5d85ed7af39ca2dcfca45ee1c103bdaabe5507 (influxdb:1.1)
Tagging influxdb:1.1
Tagging influxdb:1.1.5

$ test/run.sh influxdb:1.1
testing influxdb:1.1
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build influxdb:1.1-alpine
Building bashbrew/cache:7b51b023d7cac88edb4058b91949998fb3406cf8545eecdce88e9517d573147d (influxdb:1.1-alpine)
Tagging influxdb:1.1-alpine
Tagging influxdb:1.1.5-alpine

$ test/run.sh influxdb:1.1-alpine
testing influxdb:1.1-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 influxdb:1.2
Building bashbrew/cache:33fb02f54b49646f24bd5e8600235ff2cb909650d28611f02f2a454e9316dd55 (influxdb:1.2)
Tagging influxdb:1.2
Tagging influxdb:1.2.4
Tagging influxdb:latest

$ test/run.sh influxdb:1.2
testing influxdb:1.2
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build influxdb:1.2-alpine
Building bashbrew/cache:f836679edbcc09b62cc5d6fd04333f33df7b89861fc51936f370e44d70f0f300 (influxdb:1.2-alpine)
Tagging influxdb:1.2-alpine
Tagging influxdb:1.2.4-alpine
Tagging influxdb:alpine

$ test/run.sh influxdb:1.2-alpine
testing influxdb:1.2-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 kapacitor:1.1
Building bashbrew/cache:7ccd76e360b49f1a32f9644af77201b37a2e892922239d14c02ace30102e3cb2 (kapacitor:1.1)
Tagging kapacitor:1.1
Tagging kapacitor:1.1.1

$ test/run.sh kapacitor:1.1
testing kapacitor:1.1
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build kapacitor:1.1-alpine
Building bashbrew/cache:1a0b1dbec3689dcfe429bc046f716a6cc919305b329cb925279c887c838dcb1a (kapacitor:1.1-alpine)
Tagging kapacitor:1.1-alpine
Tagging kapacitor:1.1.1-alpine

$ test/run.sh kapacitor:1.1-alpine
testing kapacitor:1.1-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 kapacitor:1.2
Building bashbrew/cache:721d1d40af813454379239874f396fcc60dbd7edcc1b8f243e71656184941b2f (kapacitor:1.2)
Tagging kapacitor:1.2
Tagging kapacitor:1.2.1
Tagging kapacitor:latest

$ test/run.sh kapacitor:1.2
testing kapacitor:1.2
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build kapacitor:1.2-alpine
Building bashbrew/cache:ffc2f17eda9a76b0f3abb5605fae2e282a0d063c7fee6d578fc1f85b8b7466b5 (kapacitor:1.2-alpine)
Tagging kapacitor:1.2-alpine
Tagging kapacitor:1.2.1-alpine
Tagging kapacitor:alpine

$ test/run.sh kapacitor:1.2-alpine
testing kapacitor:1.2-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.2
Building bashbrew/cache:cc3653c7fe415ea5a78fdefa956e738dd60b7575dcedc0971d7a2557e2bb116b (telegraf:1.2)
Tagging telegraf:1.2
Tagging telegraf:1.2.1

$ test/run.sh telegraf:1.2
testing telegraf:1.2
	'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.2-alpine
Building bashbrew/cache:8509d43d8317f4d0d7bc3ba077fcbbfbd2d8e0ffd6b934b0b9f6d9704e9fed21 (telegraf:1.2-alpine)
Tagging telegraf:1.2-alpine
Tagging telegraf:1.2.1-alpine

$ test/run.sh telegraf:1.2-alpine
testing telegraf:1.2-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.3
Building bashbrew/cache:62509387d5fdd5983b918737d12468134e4d0465d91243dc03b304148105270b (telegraf:1.3)
Tagging telegraf:1.3
Tagging telegraf:1.3.0
Tagging telegraf:latest

$ 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:75df3e770fbb0baa4085d835c1009f83747fbf57b4e1b4505f7fdbbd53742a35 (telegraf:1.3-alpine)
Tagging telegraf:1.3-alpine
Tagging telegraf:1.3.0-alpine
Tagging telegraf: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

@yosifkit yosifkit merged commit f8fa687 into docker-library:master May 16, 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.

3 participants