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.

Sign up for GitHub

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

Jump to bottom

Upgrade telegraf to 1.1.1 and influxdb to 1.1.0 #2341

Merged
merged 1 commit into from
Nov 14, 2016
Merged

Upgrade telegraf to 1.1.1 and influxdb to 1.1.0 #2341

merged 1 commit into from
Nov 14, 2016

Conversation

jsternberg
Copy link
Contributor

No description provided.

@jsternberg jsternberg changed the title Upgrade telegraf to 1.1.1 Upgrade telegraf to 1.1.1 and influxdb to 1.1.0 Nov 14, 2016
@yosifkit
Copy link
Member 

diff --git a/influxdb_0.13.0-alpine/Dockerfile b/influxdb_0.13.0-alpine/Dockerfile
deleted file mode 100644
index a7ff043..0000000
diff --git a/influxdb_0.13.0-alpine/entrypoint.sh b/influxdb_0.13.0-alpine/entrypoint.sh
deleted file mode 100755
index 83929e5..0000000
diff --git a/influxdb_0.13.0-alpine/influxdb.conf b/influxdb_0.13.0-alpine/influxdb.conf
deleted file mode 100644
index dec9742..0000000
diff --git a/influxdb_0.13.0/Dockerfile b/influxdb_0.13.0/Dockerfile
deleted file mode 100644
index 8d00eae..0000000
diff --git a/influxdb_0.13.0/entrypoint.sh b/influxdb_0.13.0/entrypoint.sh
deleted file mode 100755
index 5a4724f..0000000
diff --git a/influxdb_0.13.0/influxdb.conf b/influxdb_0.13.0/influxdb.conf
deleted file mode 100644
index dec9742..0000000
diff --git a/influxdb_alpine/Dockerfile b/influxdb_1.0.2-alpine/Dockerfile
similarity index 100%
copy from influxdb_alpine/Dockerfile
copy to influxdb_1.0.2-alpine/Dockerfile
diff --git a/influxdb_1.1.0-rc2-alpine/entrypoint.sh b/influxdb_1.0.2-alpine/entrypoint.sh
similarity index 100%
rename from influxdb_1.1.0-rc2-alpine/entrypoint.sh
rename to influxdb_1.0.2-alpine/entrypoint.sh
diff --git a/influxdb_1.1.0-rc2/influxdb.conf b/influxdb_1.0.2-alpine/influxdb.conf
similarity index 100%
rename from influxdb_1.1.0-rc2/influxdb.conf
rename to influxdb_1.0.2-alpine/influxdb.conf
diff --git a/influxdb_latest/Dockerfile b/influxdb_1.0.2/Dockerfile
similarity index 100%
copy from influxdb_latest/Dockerfile
copy to influxdb_1.0.2/Dockerfile
diff --git a/influxdb_1.1.0-rc2/entrypoint.sh b/influxdb_1.0.2/entrypoint.sh
similarity index 100%
rename from influxdb_1.1.0-rc2/entrypoint.sh
rename to influxdb_1.0.2/entrypoint.sh
diff --git a/influxdb_1.1.0-rc2-alpine/influxdb.conf b/influxdb_1.0.2/influxdb.conf
similarity index 100%
rename from influxdb_1.1.0-rc2-alpine/influxdb.conf
rename to influxdb_1.0.2/influxdb.conf
diff --git a/influxdb_1.1.0-rc2-alpine/Dockerfile b/influxdb_1.1.0-rc2-alpine/Dockerfile
deleted file mode 100644
index d8cc896..0000000
diff --git a/influxdb_1.1.0-rc2/Dockerfile b/influxdb_1.1.0-rc2/Dockerfile
deleted file mode 100644
index 4378ad5..0000000
diff --git a/influxdb_alpine/Dockerfile b/influxdb_alpine/Dockerfile
index 89c56f8..86358ef 100644
--- a/influxdb_alpine/Dockerfile
+++ b/influxdb_alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.4

-ENV INFLUXDB_VERSION 1.0.2
+ENV INFLUXDB_VERSION 1.1.0
 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_latest/Dockerfile b/influxdb_latest/Dockerfile
index 694f69a..672154f 100644
--- a/influxdb_latest/Dockerfile
+++ b/influxdb_latest/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
 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/telegraf_alpine/Dockerfile b/telegraf_alpine/Dockerfile
index 8f4e03f..d62eaee 100644
--- a/telegraf_alpine/Dockerfile
+++ b/telegraf_alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.4

-ENV TELEGRAF_VERSION 1.1.0
+ENV TELEGRAF_VERSION 1.1.1

 RUN apk add --no-cache ca-certificates && \
     update-ca-certificates
diff --git a/telegraf_latest/Dockerfile b/telegraf_latest/Dockerfile
index 78ace72..1a1c949 100644
--- a/telegraf_latest/Dockerfile
+++ b/telegraf_latest/Dockerfile
@@ -4,7 +4,7 @@ RUN gpg \
     --keyserver hkp://ha.pool.sks-keyservers.net \
     --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5

-ENV TELEGRAF_VERSION 1.1.0
+ENV TELEGRAF_VERSION 1.1.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 && \

@yosifkit
Copy link
Member

Build test of #2341; 1398189 (influxdb, telegraf):

$ bashbrew build influxdb:1.0
Using bashbrew/cache:8916e2cde1fdf1951be45061916c7f0293f34595e0b43649bae3307dc518df53 (influxdb:1.0)
Tagging influxdb:1.0
Tagging influxdb:1.0.2

$ 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
Using bashbrew/cache:1b83f3f777fdc0e71435052f53ef35319920726ef066936b75a62024453bd333 (influxdb:1.0-alpine)
Tagging influxdb:1.0-alpine
Tagging influxdb:1.0.2-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
Building bashbrew/cache:7b0160ad6394ecad53165c4be93cae2d7f78405085c71cce8932e8fa8979bb16 (influxdb:1.1)
Tagging influxdb:1.1
Tagging influxdb:1.1.0
Tagging influxdb:latest

$ 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:d4089b4ec1df2dbc18449d49893244b5ea5b9d2478fff7799da25586d0c393b8 (influxdb:1.1-alpine)
Tagging influxdb:1.1-alpine
Tagging influxdb:1.1.0-alpine
Tagging influxdb: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 telegraf:1.0
Using bashbrew/cache:b5306a83db6100dfdc4c3f96960af114a79eeae12b37e0082da86e41bf62dd27 (telegraf:1.0)
Tagging telegraf:1.0
Tagging telegraf:1.0.1

$ test/run.sh telegraf:1.0
testing telegraf: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 telegraf:1.0-alpine
Using bashbrew/cache:573e1f74f9126fe05a54527a4c8899ef1d8509b3347de332ddf7b8b375feb2cf (telegraf:1.0-alpine)
Tagging telegraf:1.0-alpine
Tagging telegraf:1.0.1-alpine

$ test/run.sh telegraf:1.0-alpine
testing telegraf: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 telegraf:1.1
Building bashbrew/cache:c5341add11077b6d7a8f68936d7fb91a5524ba52adad81d61af8b49736416ff4 (telegraf:1.1)
Tagging telegraf:1.1
Tagging telegraf:1.1.1
Tagging telegraf:latest

$ test/run.sh telegraf:1.1
testing telegraf: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 telegraf:1.1-alpine
Building bashbrew/cache:00b35787c182341223ebe4e7cd09e959bb23e33480b2af5c0be2f08c8771480b (telegraf:1.1-alpine)
Tagging telegraf:1.1-alpine
Tagging telegraf:1.1.1-alpine
Tagging telegraf:alpine

$ test/run.sh telegraf:1.1-alpine
testing telegraf: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

@yosifkit yosifkit merged commit 0c5ae10 into docker-library:master Nov 14, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
library/influxdb library/telegraf
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jsternberg @yosifkit @docker-library-bot