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

Add release candidates for influxdb and kapacitor #2298

Merged
merged 1 commit into from
Nov 1, 2016

Conversation

jsternberg
Copy link
Contributor

No description provided.

@tianon
Copy link
Member

tianon commented Nov 1, 2016

warning: insecure protocol git:// detected: git://github.com/influxdata/influxdata-docker
diff --git a/influxdb_0.13.0-alpine/Dockerfile b/influxdb_1.1.0-rc1-alpine/Dockerfile
similarity index 97%
copy from influxdb_0.13.0-alpine/Dockerfile
copy to influxdb_1.1.0-rc1-alpine/Dockerfile
index a7ff043..c1baeea 100644
--- a/influxdb_0.13.0-alpine/Dockerfile
+++ b/influxdb_1.1.0-rc1-alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.4

-ENV INFLUXDB_VERSION 0.13.0
+ENV INFLUXDB_VERSION 1.1.0~rc1
 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_alpine/entrypoint.sh b/influxdb_1.1.0-rc1-alpine/entrypoint.sh
similarity index 100%
copy from influxdb_alpine/entrypoint.sh
copy to influxdb_1.1.0-rc1-alpine/entrypoint.sh
diff --git a/influxdb_latest/influxdb.conf b/influxdb_1.1.0-rc1-alpine/influxdb.conf
similarity index 100%
copy from influxdb_latest/influxdb.conf
copy to influxdb_1.1.0-rc1-alpine/influxdb.conf
diff --git a/influxdb_latest/Dockerfile b/influxdb_1.1.0-rc1/Dockerfile
similarity index 95%
copy from influxdb_latest/Dockerfile
copy to influxdb_1.1.0-rc1/Dockerfile
index 694f69a..90eb107 100644
--- a/influxdb_latest/Dockerfile
+++ b/influxdb_1.1.0-rc1/Dockerfile
@@ -4,7 +4,7 @@ RUN gpg \
     --keyserver hkp://ha.pool.sks-keyservers.net \
     --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5

-ENV INFLUXDB_VERSION 1.0.2
+ENV INFLUXDB_VERSION 1.1.0~rc1
 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_latest/entrypoint.sh b/influxdb_1.1.0-rc1/entrypoint.sh
similarity index 100%
copy from influxdb_latest/entrypoint.sh
copy to influxdb_1.1.0-rc1/entrypoint.sh
diff --git a/influxdb_latest/influxdb.conf b/influxdb_1.1.0-rc1/influxdb.conf
similarity index 100%
copy from influxdb_latest/influxdb.conf
copy to influxdb_1.1.0-rc1/influxdb.conf
diff --git a/kapacitor_alpine/Dockerfile b/kapacitor_1.1.0-rc1-alpine/Dockerfile
similarity index 97%
copy from kapacitor_alpine/Dockerfile
copy to kapacitor_1.1.0-rc1-alpine/Dockerfile
index a0d5512..8541062 100644
--- a/kapacitor_alpine/Dockerfile
+++ b/kapacitor_1.1.0-rc1-alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.4

-ENV KAPACITOR_VERSION 1.0.2
+ENV KAPACITOR_VERSION 1.1.0~rc1
 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_alpine/entrypoint.sh b/kapacitor_1.1.0-rc1-alpine/entrypoint.sh
similarity index 100%
copy from kapacitor_alpine/entrypoint.sh
copy to kapacitor_1.1.0-rc1-alpine/entrypoint.sh
diff --git a/kapacitor_latest/kapacitor.conf b/kapacitor_1.1.0-rc1-alpine/kapacitor.conf
similarity index 100%
copy from kapacitor_latest/kapacitor.conf
copy to kapacitor_1.1.0-rc1-alpine/kapacitor.conf
diff --git a/kapacitor_latest/Dockerfile b/kapacitor_1.1.0-rc1/Dockerfile
similarity index 95%
copy from kapacitor_latest/Dockerfile
copy to kapacitor_1.1.0-rc1/Dockerfile
index 0f88f72..9d08966 100644
--- a/kapacitor_latest/Dockerfile
+++ b/kapacitor_1.1.0-rc1/Dockerfile
@@ -4,7 +4,7 @@ RUN gpg \
     --keyserver hkp://ha.pool.sks-keyservers.net \
     --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5

-ENV KAPACITOR_VERSION 1.0.2
+ENV KAPACITOR_VERSION 1.1.0~rc1
 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_latest/entrypoint.sh b/kapacitor_1.1.0-rc1/entrypoint.sh
similarity index 100%
copy from kapacitor_latest/entrypoint.sh
copy to kapacitor_1.1.0-rc1/entrypoint.sh
diff --git a/kapacitor_latest/kapacitor.conf b/kapacitor_1.1.0-rc1/kapacitor.conf
similarity index 100%
copy from kapacitor_latest/kapacitor.conf
copy to kapacitor_1.1.0-rc1/kapacitor.conf

@tianon
Copy link
Member

tianon commented Nov 1, 2016

LGTM

warning: insecure protocol git:// detected: git://github.com/influxdata/influxdata-docker
Build test of #2298; 246191a (influxdb, kapacitor):

$ bashbrew build influxdb:0.13
Building bashbrew/cache:36af524954a0747e8be68430150ab423c09926cfc9b1c6723f0e304da702f951 (influxdb:0.13)
Tagging influxdb:0.13
Tagging influxdb:0.13.0

$ 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
Building bashbrew/cache:f86bf707677afbdac2c4ad02dcc6de070ab6b2fe8a30dd46423d4cff6e10a3b0 (influxdb:0.13-alpine)
Tagging influxdb:0.13-alpine
Tagging influxdb:0.13.0-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
Building bashbrew/cache:63f1f8c1b4846011ec865a20ad3ba985b7fa40be5728f13613e6399d21077b10 (influxdb:1.0)
Tagging influxdb:1.0
Tagging influxdb:1.0.2
Tagging influxdb:latest

$ test/run.sh influxdb:1.0
testing influxdb:1.0
    '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-alpine
Building bashbrew/cache:1b83f3f777fdc0e71435052f53ef35319920726ef066936b75a62024453bd333 (influxdb:1.0-alpine)
Tagging influxdb:1.0-alpine
Tagging influxdb:1.0.2-alpine
Tagging influxdb:alpine

$ test/run.sh influxdb:1.0-alpine
testing influxdb:1.0-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.0-rc1
Building bashbrew/cache:8f1f63eb05507bf731c6ff1df7c93d07880e30307f3f6f4154b2e805ba15d888 (influxdb:1.1.0-rc1)
Tagging influxdb:1.1.0-rc1

$ test/run.sh influxdb:1.1.0-rc1
testing influxdb:1.1.0-rc1
    '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.0-rc1-alpine
Building bashbrew/cache:37b0f71a1cd356236522451cabb1a594ace2389f62b44027f6c3144bf40fefcb (influxdb:1.1.0-rc1-alpine)
Tagging influxdb:1.1.0-rc1-alpine

$ test/run.sh influxdb:1.1.0-rc1-alpine
testing influxdb:1.1.0-rc1-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.13
Building bashbrew/cache:1cc80124d51e78f1b798fa0a68723b0499d404064fa132e286bff4c564a02b45 (kapacitor:0.13)
Tagging kapacitor:0.13
Tagging kapacitor:0.13.1

$ 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
Building bashbrew/cache:dee12be64faf0efc983b2c6379be64f377b95e74ae63bde4a63840f24990745c (kapacitor:0.13-alpine)
Tagging kapacitor:0.13-alpine
Tagging kapacitor:0.13.1-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
Building bashbrew/cache:0954f48b69b7010e7b8eadd4a7b408184d87a2f4b41e5b793977f45628c027ae (kapacitor:1.0)
Tagging kapacitor:1.0
Tagging kapacitor:1.0.2
Tagging kapacitor:latest

$ test/run.sh kapacitor:1.0
testing kapacitor:1.0
    '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-alpine
Building bashbrew/cache:2bccbac0a76b8adbbef54abb5e8530c738a1d65ceaeedca3212c8e921180675b (kapacitor:1.0-alpine)
Tagging kapacitor:1.0-alpine
Tagging kapacitor:1.0.2-alpine
Tagging kapacitor:alpine

$ test/run.sh kapacitor:1.0-alpine
testing kapacitor:1.0-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.0-rc1
Building bashbrew/cache:4a01fa3cc5b346c68bdc1d2a46b542e9cdf13405dfef1add8a47860a220ec1a0 (kapacitor:1.1.0-rc1)
Tagging kapacitor:1.1.0-rc1

$ test/run.sh kapacitor:1.1.0-rc1
testing kapacitor:1.1.0-rc1
    '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.0-rc1-alpine
Building bashbrew/cache:cde79cac48fe43435cfdcc0b646d1d0846095de48fa30765f8bd2c7925c84a73 (kapacitor:1.1.0-rc1-alpine)
Tagging kapacitor:1.1.0-rc1-alpine

$ test/run.sh kapacitor:1.1.0-rc1-alpine
testing kapacitor:1.1.0-rc1-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 785c925 into docker-library:master Nov 1, 2016
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