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

Switch influxdata stack to use a single repository #1823

Merged
merged 1 commit into from
Jun 9, 2016

Conversation

jsternberg
Copy link
Contributor

The 0.12 version is still supported, but will use the old repositories
instead of being moved to the new repository.

@jsternberg jsternberg changed the title Switch influxdb, kapacitor, and telegraf to use a single repository Switch influxdata stack to use a single repository Jun 8, 2016
@jsternberg
Copy link
Contributor Author

I just realized I screwed up this PR and there are other changes we need to make at the same time that I didn't know about until now. I'll be pushing an amended change soon. Sorry.

latest: git://github.com/influxdata/chronograf-docker@82b30f8a10b7dde9b13953400288768f109bf749 0.13
0.13: git://github.com/influxdata/influxdata-docker@215cf009c143dc739b5b10084ae330ca7f3665d6 0.13
0.13.0: git://github.com/influxdata/influxdata-docker@215cf009c143dc739b5b10084ae330ca7f3665d6 0.13
latest: git://github.com/influxdata/influxdata-docker@215cf009c143dc739b5b10084ae330ca7f3665d6 0.13
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These lines are missing the chronograf folder on the end: chronograf/0.13

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I missed that with the others and fixed it, but it seems I forgot this one.

latest: git://github.com/influxdata/telegraf-docker@9f5442edabacd2a72627246e7ee8c7d276bd0f28 0.13
0.13: git://github.com/influxdata/influxdata-docker@215cf009c143dc739b5b10084ae330ca7f3665d6 0.13
0.13.1: git://github.com/influxdata/influxdata-docker@215cf009c143dc739b5b10084ae330ca7f3665d6 0.13
latest: git://github.com/influxdata/influxdata-docker@215cf009c143dc739b5b10084ae330ca7f3665d6 0.13
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one too 😉

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

The 0.12 version is still supported, but will use the old repositories
instead of being moved to the new repository.

Adding 1.0 beta1 images for influxdb, kapacitor, and telegraf. The beta
images do not have aliases to avoid any kind of confusion.

telegraf:0.13 is upgraded to 0.13.1. The telegraf alpine image also has
the default configuration file from the tarball copied to
`/etc/telegraf/telegraf.conf` instead of being blank.
@tianon
Copy link
Member

tianon commented Jun 9, 2016

diff --git a/influxdb-0.13-alpine/Dockerfile b/influxdb-0.13-alpine/Dockerfile
index 67c5ce5..a7ff043 100644
--- a/influxdb-0.13-alpine/Dockerfile
+++ b/influxdb-0.13-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.3
+FROM alpine:3.4

 ENV INFLUXDB_VERSION 0.13.0
 RUN apk add --no-cache --virtual .build-deps wget gnupg tar ca-certificates && \
diff --git a/influxdb-0.13/alpine/Dockerfile b/influxdb-0.13/alpine/Dockerfile
index 67c5ce5..a7ff043 100644
--- a/influxdb-0.13/alpine/Dockerfile
+++ b/influxdb-0.13/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.3
+FROM alpine:3.4

 ENV INFLUXDB_VERSION 0.13.0
 RUN apk add --no-cache --virtual .build-deps wget gnupg tar ca-certificates && \
diff --git a/influxdb-0.13-alpine/Dockerfile b/influxdb-1.0.0-beta1-alpine/Dockerfile
similarity index 95%
copy from influxdb-0.13-alpine/Dockerfile
copy to influxdb-1.0.0-beta1-alpine/Dockerfile
index 67c5ce5..bb96ec8 100644
--- a/influxdb-0.13-alpine/Dockerfile
+++ b/influxdb-1.0.0-beta1-alpine/Dockerfile
@@ -1,6 +1,6 @@
-FROM alpine:3.3
+FROM alpine:3.4

-ENV INFLUXDB_VERSION 0.13.0
+ENV INFLUXDB_VERSION 1.0.0-beta1
 RUN apk add --no-cache --virtual .build-deps wget gnupg tar ca-certificates && \
     update-ca-certificates && \
     gpg --keyserver hkp://ha.pool.sks-keyservers.net \
diff --git a/influxdb-0.13/alpine/entrypoint.sh b/influxdb-1.0.0-beta1-alpine/entrypoint.sh
similarity index 100%
copy from influxdb-0.13/alpine/entrypoint.sh
copy to influxdb-1.0.0-beta1-alpine/entrypoint.sh
diff --git a/influxdb-0.13/influxdb.conf b/influxdb-1.0.0-beta1-alpine/influxdb.conf
similarity index 100%
copy from influxdb-0.13/influxdb.conf
copy to influxdb-1.0.0-beta1-alpine/influxdb.conf
diff --git a/influxdb-0.13/Dockerfile b/influxdb-1.0.0-beta1/Dockerfile
similarity index 95%
copy from influxdb-0.13/Dockerfile
copy to influxdb-1.0.0-beta1/Dockerfile
index 8d00eae..f2fa0e9 100644
--- a/influxdb-0.13/Dockerfile
+++ b/influxdb-1.0.0-beta1/Dockerfile
@@ -4,7 +4,7 @@ RUN gpg \
     --keyserver hkp://ha.pool.sks-keyservers.net \
     --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5

-ENV INFLUXDB_VERSION 0.13.0
+ENV INFLUXDB_VERSION 1.0.0-beta1
 RUN wget -q https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_amd64.deb.asc && \
     wget -q https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_amd64.deb && \
     gpg --batch --verify influxdb_${INFLUXDB_VERSION}_amd64.deb.asc influxdb_${INFLUXDB_VERSION}_amd64.deb && \
diff --git a/influxdb-0.13-alpine/Dockerfile b/influxdb-1.0.0-beta1/alpine/Dockerfile
similarity index 95%
copy from influxdb-0.13-alpine/Dockerfile
copy to influxdb-1.0.0-beta1/alpine/Dockerfile
index 67c5ce5..bb96ec8 100644
--- a/influxdb-0.13-alpine/Dockerfile
+++ b/influxdb-1.0.0-beta1/alpine/Dockerfile
@@ -1,6 +1,6 @@
-FROM alpine:3.3
+FROM alpine:3.4

-ENV INFLUXDB_VERSION 0.13.0
+ENV INFLUXDB_VERSION 1.0.0-beta1
 RUN apk add --no-cache --virtual .build-deps wget gnupg tar ca-certificates && \
     update-ca-certificates && \
     gpg --keyserver hkp://ha.pool.sks-keyservers.net \
diff --git a/influxdb-0.13/alpine/entrypoint.sh b/influxdb-1.0.0-beta1/alpine/entrypoint.sh
similarity index 100%
copy from influxdb-0.13/alpine/entrypoint.sh
copy to influxdb-1.0.0-beta1/alpine/entrypoint.sh
diff --git a/influxdb-0.13/influxdb.conf b/influxdb-1.0.0-beta1/alpine/influxdb.conf
similarity index 100%
copy from influxdb-0.13/influxdb.conf
copy to influxdb-1.0.0-beta1/alpine/influxdb.conf
diff --git a/influxdb-0.13/entrypoint.sh b/influxdb-1.0.0-beta1/entrypoint.sh
similarity index 100%
copy from influxdb-0.13/entrypoint.sh
copy to influxdb-1.0.0-beta1/entrypoint.sh
diff --git a/influxdb-0.13/influxdb.conf b/influxdb-1.0.0-beta1/influxdb.conf
similarity index 100%
copy from influxdb-0.13/influxdb.conf
copy to influxdb-1.0.0-beta1/influxdb.conf
diff --git a/kapacitor-0.13-alpine/Dockerfile b/kapacitor-0.13-alpine/Dockerfile
index 6b88e5a..b19ae20 100644
--- a/kapacitor-0.13-alpine/Dockerfile
+++ b/kapacitor-0.13-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.3
+FROM alpine:3.4

 ENV KAPACITOR_VERSION 0.13.1
 RUN apk add --no-cache --virtual .build-deps wget gnupg tar ca-certificates && \
diff --git a/kapacitor-0.13/alpine/Dockerfile b/kapacitor-0.13/alpine/Dockerfile
index 6b88e5a..b19ae20 100644
--- a/kapacitor-0.13/alpine/Dockerfile
+++ b/kapacitor-0.13/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.3
+FROM alpine:3.4

 ENV KAPACITOR_VERSION 0.13.1
 RUN apk add --no-cache --virtual .build-deps wget gnupg tar ca-certificates && \
diff --git a/kapacitor-0.13/alpine/Dockerfile b/kapacitor-1.0.0-beta1-alpine/Dockerfile
similarity index 95%
copy from kapacitor-0.13/alpine/Dockerfile
copy to kapacitor-1.0.0-beta1-alpine/Dockerfile
index 6b88e5a..45f6bb6 100644
--- a/kapacitor-0.13/alpine/Dockerfile
+++ b/kapacitor-1.0.0-beta1-alpine/Dockerfile
@@ -1,6 +1,6 @@
-FROM alpine:3.3
+FROM alpine:3.4

-ENV KAPACITOR_VERSION 0.13.1
+ENV KAPACITOR_VERSION 1.0.0~beta1
 RUN apk add --no-cache --virtual .build-deps wget gnupg tar ca-certificates && \
     update-ca-certificates && \
     gpg --keyserver hkp://ha.pool.sks-keyservers.net \
diff --git a/kapacitor-0.13/alpine/entrypoint.sh b/kapacitor-1.0.0-beta1-alpine/entrypoint.sh
similarity index 100%
copy from kapacitor-0.13/alpine/entrypoint.sh
copy to kapacitor-1.0.0-beta1-alpine/entrypoint.sh
diff --git a/kapacitor-0.13/Dockerfile b/kapacitor-1.0.0-beta1/Dockerfile
similarity index 95%
copy from kapacitor-0.13/Dockerfile
copy to kapacitor-1.0.0-beta1/Dockerfile
index 6d20e36..38d44f8 100644
--- a/kapacitor-0.13/Dockerfile
+++ b/kapacitor-1.0.0-beta1/Dockerfile
@@ -4,7 +4,7 @@ RUN gpg \
     --keyserver hkp://ha.pool.sks-keyservers.net \
     --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5

-ENV KAPACITOR_VERSION 0.13.1
+ENV KAPACITOR_VERSION 1.0.0~beta1
 RUN wget -q https://dl.influxdata.com/kapacitor/releases/kapacitor_${KAPACITOR_VERSION}_amd64.deb.asc && \
     wget -q https://dl.influxdata.com/kapacitor/releases/kapacitor_${KAPACITOR_VERSION}_amd64.deb && \
     gpg --batch --verify kapacitor_${KAPACITOR_VERSION}_amd64.deb.asc kapacitor_${KAPACITOR_VERSION}_amd64.deb && \
diff --git a/kapacitor-0.13/alpine/Dockerfile b/kapacitor-1.0.0-beta1/alpine/Dockerfile
similarity index 95%
copy from kapacitor-0.13/alpine/Dockerfile
copy to kapacitor-1.0.0-beta1/alpine/Dockerfile
index 6b88e5a..45f6bb6 100644
--- a/kapacitor-0.13/alpine/Dockerfile
+++ b/kapacitor-1.0.0-beta1/alpine/Dockerfile
@@ -1,6 +1,6 @@
-FROM alpine:3.3
+FROM alpine:3.4

-ENV KAPACITOR_VERSION 0.13.1
+ENV KAPACITOR_VERSION 1.0.0~beta1
 RUN apk add --no-cache --virtual .build-deps wget gnupg tar ca-certificates && \
     update-ca-certificates && \
     gpg --keyserver hkp://ha.pool.sks-keyservers.net \
diff --git a/kapacitor-0.13/alpine/entrypoint.sh b/kapacitor-1.0.0-beta1/alpine/entrypoint.sh
similarity index 100%
copy from kapacitor-0.13/alpine/entrypoint.sh
copy to kapacitor-1.0.0-beta1/alpine/entrypoint.sh
diff --git a/kapacitor-0.13/entrypoint.sh b/kapacitor-1.0.0-beta1/entrypoint.sh
similarity index 100%
copy from kapacitor-0.13/entrypoint.sh
copy to kapacitor-1.0.0-beta1/entrypoint.sh
diff --git a/telegraf-0.13-alpine/Dockerfile b/telegraf-0.13-alpine/Dockerfile
index f396770..b7394d4 100644
--- a/telegraf-0.13-alpine/Dockerfile
+++ b/telegraf-0.13-alpine/Dockerfile
@@ -1,6 +1,6 @@
-FROM alpine:3.3
+FROM alpine:3.4

-ENV TELEGRAF_VERSION 0.13.0
+ENV TELEGRAF_VERSION 0.13.1
 RUN apk add --no-cache --virtual .build-deps wget gnupg tar ca-certificates && \
     update-ca-certificates && \
     gpg --keyserver hkp://ha.pool.sks-keyservers.net \
@@ -8,11 +8,11 @@ RUN apk add --no-cache --virtual .build-deps wget gnupg tar ca-certificates && \
     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 && \
-    mkdir -p /usr/src && \
+    mkdir -p /usr/src /etc/telegraf && \
     tar -C /usr/src -xzf telegraf-${TELEGRAF_VERSION}-static_linux_amd64.tar.gz && \
-    rm -f /usr/src/telegraf-*/telegraf.conf && \
-    chmod +x /usr/src/telegraf-*/* && \
-    cp -a /usr/src/telegraf-*/* /usr/bin/ && \
+    mv /usr/src/telegraf*/telegraf.conf /etc/telegraf/ && \
+    chmod +x /usr/src/telegraf*/* && \
+    cp -a /usr/src/telegraf*/* /usr/bin/ && \
     rm -rf *.tar.gz* /usr/src /root/.gnupg && \
     apk del .build-deps

diff --git a/telegraf-0.13/Dockerfile b/telegraf-0.13/Dockerfile
index d9f127c..91e5070 100644
--- a/telegraf-0.13/Dockerfile
+++ b/telegraf-0.13/Dockerfile
@@ -4,7 +4,7 @@ RUN gpg \
     --keyserver hkp://ha.pool.sks-keyservers.net \
     --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5

-ENV TELEGRAF_VERSION 0.13.0
+ENV TELEGRAF_VERSION 0.13.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-0.13/alpine/Dockerfile b/telegraf-0.13/alpine/Dockerfile
index f396770..b7394d4 100644
--- a/telegraf-0.13/alpine/Dockerfile
+++ b/telegraf-0.13/alpine/Dockerfile
@@ -1,6 +1,6 @@
-FROM alpine:3.3
+FROM alpine:3.4

-ENV TELEGRAF_VERSION 0.13.0
+ENV TELEGRAF_VERSION 0.13.1
 RUN apk add --no-cache --virtual .build-deps wget gnupg tar ca-certificates && \
     update-ca-certificates && \
     gpg --keyserver hkp://ha.pool.sks-keyservers.net \
@@ -8,11 +8,11 @@ RUN apk add --no-cache --virtual .build-deps wget gnupg tar ca-certificates && \
     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 && \
-    mkdir -p /usr/src && \
+    mkdir -p /usr/src /etc/telegraf && \
     tar -C /usr/src -xzf telegraf-${TELEGRAF_VERSION}-static_linux_amd64.tar.gz && \
-    rm -f /usr/src/telegraf-*/telegraf.conf && \
-    chmod +x /usr/src/telegraf-*/* && \
-    cp -a /usr/src/telegraf-*/* /usr/bin/ && \
+    mv /usr/src/telegraf*/telegraf.conf /etc/telegraf/ && \
+    chmod +x /usr/src/telegraf*/* && \
+    cp -a /usr/src/telegraf*/* /usr/bin/ && \
     rm -rf *.tar.gz* /usr/src /root/.gnupg && \
     apk del .build-deps

diff --git a/telegraf-0.13-alpine/Dockerfile b/telegraf-1.0.0-beta1-alpine/Dockerfile
similarity index 79%
copy from telegraf-0.13-alpine/Dockerfile
copy to telegraf-1.0.0-beta1-alpine/Dockerfile
index f396770..af0e590 100644
--- a/telegraf-0.13-alpine/Dockerfile
+++ b/telegraf-1.0.0-beta1-alpine/Dockerfile
@@ -1,6 +1,6 @@
-FROM alpine:3.3
+FROM alpine:3.4

-ENV TELEGRAF_VERSION 0.13.0
+ENV TELEGRAF_VERSION 1.0.0-beta1
 RUN apk add --no-cache --virtual .build-deps wget gnupg tar ca-certificates && \
     update-ca-certificates && \
     gpg --keyserver hkp://ha.pool.sks-keyservers.net \
@@ -8,11 +8,11 @@ RUN apk add --no-cache --virtual .build-deps wget gnupg tar ca-certificates && \
     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 && \
-    mkdir -p /usr/src && \
+    mkdir -p /usr/src /etc/telegraf && \
     tar -C /usr/src -xzf telegraf-${TELEGRAF_VERSION}-static_linux_amd64.tar.gz && \
-    rm -f /usr/src/telegraf-*/telegraf.conf && \
-    chmod +x /usr/src/telegraf-*/* && \
-    cp -a /usr/src/telegraf-*/* /usr/bin/ && \
+    mv /usr/src/telegraf*/telegraf.conf /etc/telegraf/ && \
+    chmod +x /usr/src/telegraf*/* && \
+    cp -a /usr/src/telegraf*/* /usr/bin/ && \
     rm -rf *.tar.gz* /usr/src /root/.gnupg && \
     apk del .build-deps

diff --git a/telegraf-0.13/alpine/entrypoint.sh b/telegraf-1.0.0-beta1-alpine/entrypoint.sh
similarity index 100%
copy from telegraf-0.13/alpine/entrypoint.sh
copy to telegraf-1.0.0-beta1-alpine/entrypoint.sh
diff --git a/telegraf-0.13/Dockerfile b/telegraf-1.0.0-beta1/Dockerfile
similarity index 95%
copy from telegraf-0.13/Dockerfile
copy to telegraf-1.0.0-beta1/Dockerfile
index d9f127c..83b922a 100644
--- a/telegraf-0.13/Dockerfile
+++ b/telegraf-1.0.0-beta1/Dockerfile
@@ -4,7 +4,7 @@ RUN gpg \
     --keyserver hkp://ha.pool.sks-keyservers.net \
     --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5

-ENV TELEGRAF_VERSION 0.13.0
+ENV TELEGRAF_VERSION 1.0.0-beta1
 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-0.13-alpine/Dockerfile b/telegraf-1.0.0-beta1/alpine/Dockerfile
similarity index 79%
copy from telegraf-0.13-alpine/Dockerfile
copy to telegraf-1.0.0-beta1/alpine/Dockerfile
index f396770..af0e590 100644
--- a/telegraf-0.13-alpine/Dockerfile
+++ b/telegraf-1.0.0-beta1/alpine/Dockerfile
@@ -1,6 +1,6 @@
-FROM alpine:3.3
+FROM alpine:3.4

-ENV TELEGRAF_VERSION 0.13.0
+ENV TELEGRAF_VERSION 1.0.0-beta1
 RUN apk add --no-cache --virtual .build-deps wget gnupg tar ca-certificates && \
     update-ca-certificates && \
     gpg --keyserver hkp://ha.pool.sks-keyservers.net \
@@ -8,11 +8,11 @@ RUN apk add --no-cache --virtual .build-deps wget gnupg tar ca-certificates && \
     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 && \
-    mkdir -p /usr/src && \
+    mkdir -p /usr/src /etc/telegraf && \
     tar -C /usr/src -xzf telegraf-${TELEGRAF_VERSION}-static_linux_amd64.tar.gz && \
-    rm -f /usr/src/telegraf-*/telegraf.conf && \
-    chmod +x /usr/src/telegraf-*/* && \
-    cp -a /usr/src/telegraf-*/* /usr/bin/ && \
+    mv /usr/src/telegraf*/telegraf.conf /etc/telegraf/ && \
+    chmod +x /usr/src/telegraf*/* && \
+    cp -a /usr/src/telegraf*/* /usr/bin/ && \
     rm -rf *.tar.gz* /usr/src /root/.gnupg && \
     apk del .build-deps

diff --git a/telegraf-0.13/alpine/entrypoint.sh b/telegraf-1.0.0-beta1/alpine/entrypoint.sh
similarity index 100%
copy from telegraf-0.13/alpine/entrypoint.sh
copy to telegraf-1.0.0-beta1/alpine/entrypoint.sh
diff --git a/telegraf-0.13/entrypoint.sh b/telegraf-1.0.0-beta1/entrypoint.sh
similarity index 100%
copy from telegraf-0.13/entrypoint.sh
copy to telegraf-1.0.0-beta1/entrypoint.sh

@yosifkit
Copy link
Member

yosifkit commented Jun 9, 2016

LGTM, Build test of #1823; 6676764 (chronograf, influxdb, kapacitor, telegraf):

$ bashbrew build chronograf:0.12
Using bashbrew/cache:923fb35af9147730bbf639beb7f77bb62034ece923f9464129bdc88126804495 (chronograf:0.12)
Tagging chronograf:0.12
Tagging chronograf:0.12.0

$ test/run.sh chronograf:0.12
testing chronograf:0.12
    '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:0.13
Using bashbrew/cache:d8e4a1df9f32de9b28b95ca839f1a88cbc4a8a18ef83d6a2519ce2c07ee21d80 (chronograf:0.13)
Tagging chronograf:0.13
Tagging chronograf:0.13.0
Tagging chronograf:latest

$ test/run.sh chronograf:0.13
testing chronograf:0.13
    '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:0.12
Using bashbrew/cache:7f83a08a6ab1582f766aa68b3b93caa39fceb9a331269a94fc9153b4b8c2f277 (influxdb:0.12)
Tagging influxdb:0.12
Tagging influxdb:0.12.2

$ test/run.sh influxdb:0.12
testing influxdb:0.12
    '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:0.13
Using bashbrew/cache:f828229ff4b54027e70f17f21249e7b6c32bf84f9c7b5338973643b18e50f5b0 (influxdb:0.13)
Tagging influxdb:0.13
Tagging influxdb:0.13.0
Tagging influxdb:latest

$ test/run.sh influxdb:0.13
testing influxdb:0.13
    '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:0.13-alpine
Using bashbrew/cache:00e7e8dd96f67aada19d06b1f22216010dd82e7a80c083f2e80a42c930f7e0ff (influxdb:0.13-alpine)
Tagging influxdb:0.13-alpine
Tagging influxdb:0.13.0-alpine
Tagging influxdb:alpine

$ test/run.sh influxdb:0.13-alpine
testing influxdb:0.13-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.0.0-beta1
Using bashbrew/cache:49f3019226d16af917c65bf4d72c00d6d9b438167e3c8f15a4ef83b3400fe328 (influxdb:1.0.0-beta1)
Tagging influxdb:1.0.0-beta1

$ test/run.sh influxdb:1.0.0-beta1
testing influxdb:1.0.0-beta1
    '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.0.0-beta1-alpine
Using bashbrew/cache:e622ee59aafd2b3239b8885f9e624c4e41d5077527a4c2c3454ab8acf3cd39c9 (influxdb:1.0.0-beta1-alpine)
Tagging influxdb:1.0.0-beta1-alpine

$ test/run.sh influxdb:1.0.0-beta1-alpine
testing influxdb:1.0.0-beta1-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:0.12
Using bashbrew/cache:35718eb7ffbf46daefb5ab45a30f8560fe683aa7dfb632fc359223ec3edace0b (kapacitor:0.12)
Tagging kapacitor:0.12
Tagging kapacitor:0.12.0

$ test/run.sh kapacitor:0.12
testing kapacitor:0.12
    '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:0.13
Using bashbrew/cache:099a8b8e8234d7db9d553cd778796f9bcc15513f1a901152dbd15b225db81504 (kapacitor:0.13)
Tagging kapacitor:0.13
Tagging kapacitor:0.13.1
Tagging kapacitor:latest

$ test/run.sh kapacitor:0.13
testing kapacitor:0.13
    '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:0.13-alpine
Using bashbrew/cache:31f7da4f925a7c282351cfdf1665db560dd790cf20f637d5ad47fb0d577f2a62 (kapacitor:0.13-alpine)
Tagging kapacitor:0.13-alpine
Tagging kapacitor:0.13.1-alpine
Tagging kapacitor:alpine

$ test/run.sh kapacitor:0.13-alpine
testing kapacitor:0.13-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.0.0-beta1
Using bashbrew/cache:0e09618d7875e23f914cbad690d111af632e0578df9cf758a814c02b07c4038b (kapacitor:1.0.0-beta1)
Tagging kapacitor:1.0.0-beta1

$ test/run.sh kapacitor:1.0.0-beta1
testing kapacitor:1.0.0-beta1
    '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.0.0-beta1-alpine
Using bashbrew/cache:0c08dbb36bfb6fe35f3e520750174cd4f913cfc329b467156dc04b9c90352e94 (kapacitor:1.0.0-beta1-alpine)
Tagging kapacitor:1.0.0-beta1-alpine

$ test/run.sh kapacitor:1.0.0-beta1-alpine
testing kapacitor:1.0.0-beta1-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:0.12
Using bashbrew/cache:d0e7ce4a5d7495bd8d2769f0edb1d7ce4cf790c92bdddc36e7f288da9bdf51e5 (telegraf:0.12)
Tagging telegraf:0.12
Tagging telegraf:0.12.0

$ test/run.sh telegraf:0.12
testing telegraf:0.12
    '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:0.13
Using bashbrew/cache:ac947dd839d695ab9f975fd2c119613eca91492110451b54d36b796c5e660822 (telegraf:0.13)
Tagging telegraf:0.13
Tagging telegraf:0.13.1
Tagging telegraf:latest

$ test/run.sh telegraf:0.13
testing telegraf:0.13
    '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:0.13-alpine
Using bashbrew/cache:8871799db7cbe613c2445f5a3f6be94b43bfa607cac37dabdfb5fa81fcf6d32f (telegraf:0.13-alpine)
Tagging telegraf:0.13-alpine
Tagging telegraf:0.13.1-alpine
Tagging telegraf:alpine

$ test/run.sh telegraf:0.13-alpine
testing telegraf:0.13-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.0.0-beta1
Using bashbrew/cache:29ef08e6192ef5082faf096b90911d1e18d8c3e2a6885e725eebef2479ae9c8c (telegraf:1.0.0-beta1)
Tagging telegraf:1.0.0-beta1

$ test/run.sh telegraf:1.0.0-beta1
testing telegraf:1.0.0-beta1
    '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.0.0-beta1-alpine
Using bashbrew/cache:797cc318f0e6ffe16d140830567779276292f75497cef4b4c8aac16e805d5433 (telegraf:1.0.0-beta1-alpine)
Tagging telegraf:1.0.0-beta1-alpine

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

As a side note, have you seen the new library file format: https://github.com/docker-library/official-images#instruction-format. No hurry to change, the new builder code is backwards compatible with the old library file format; we just want to let you know of the increased control that is available.

@yosifkit yosifkit merged commit ee361cc into docker-library:master Jun 9, 2016
@jsternberg
Copy link
Contributor Author

Thanks! The new format looks easier, so we'll try to convert to using that the next time we update the files.

@tianon
Copy link
Member

tianon commented Jun 10, 2016 via email

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.

4 participants