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

influxdb 1.1.3 #2678

Merged
merged 1 commit into from
Feb 21, 2017
Merged

influxdb 1.1.3 #2678

merged 1 commit into from
Feb 21, 2017

Conversation

jsternberg
Copy link
Contributor

No description provided.

@tianon
Copy link
Member

tianon commented Feb 21, 2017

warning: insecure protocol git:// detected: git://github.com/influxdata/influxdata-docker
diff --git a/influxdb_1.1.2-alpine/Dockerfile b/influxdb_1.1.3-alpine/Dockerfile
similarity index 97%
rename from influxdb_1.1.2-alpine/Dockerfile
rename to influxdb_1.1.3-alpine/Dockerfile
index f242101..c959260 100644
--- a/influxdb_1.1.2-alpine/Dockerfile
+++ b/influxdb_1.1.3-alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.5
 
-ENV INFLUXDB_VERSION 1.1.2
+ENV INFLUXDB_VERSION 1.1.3
 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_1.1.2-alpine/entrypoint.sh b/influxdb_1.1.3-alpine/entrypoint.sh
similarity index 100%
rename from influxdb_1.1.2-alpine/entrypoint.sh
rename to influxdb_1.1.3-alpine/entrypoint.sh
diff --git a/influxdb_1.1.2-alpine/influxdb.conf b/influxdb_1.1.3-alpine/influxdb.conf
similarity index 100%
rename from influxdb_1.1.2-alpine/influxdb.conf
rename to influxdb_1.1.3-alpine/influxdb.conf
diff --git a/influxdb_1.1.2/Dockerfile b/influxdb_1.1.3/Dockerfile
similarity index 96%
rename from influxdb_1.1.2/Dockerfile
rename to influxdb_1.1.3/Dockerfile
index 02898d4..954ab2e 100644
--- a/influxdb_1.1.2/Dockerfile
+++ b/influxdb_1.1.3/Dockerfile
@@ -4,7 +4,7 @@ RUN gpg \
     --keyserver hkp://ha.pool.sks-keyservers.net \
     --recv-keys 05CE15085FC09D18E99EFB22684A14CF2582E0C5
 
-ENV INFLUXDB_VERSION 1.1.2
+ENV INFLUXDB_VERSION 1.1.3
 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_1.1.2/entrypoint.sh b/influxdb_1.1.3/entrypoint.sh
similarity index 100%
rename from influxdb_1.1.2/entrypoint.sh
rename to influxdb_1.1.3/entrypoint.sh
diff --git a/influxdb_1.1.2/influxdb.conf b/influxdb_1.1.3/influxdb.conf
similarity index 100%
rename from influxdb_1.1.2/influxdb.conf
rename to influxdb_1.1.3/influxdb.conf

@tianon
Copy link
Member

tianon commented Feb 21, 2017

LGTM

Build test of #2678; bbae75c (influxdb):
warning: insecure protocol git:// detected: git://github.com/influxdata/influxdata-docker

$ bashbrew build influxdb:1.1
Building bashbrew/cache:fdcddb129193a01cca355cf8450f234c68aeddfa9ba70acb2d95f7f82a7b1b23 (influxdb:1.1)
Tagging influxdb:1.1
Tagging influxdb:1.1.3

$ 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:ee79365760242dd8bd10f5d2049ecb65e32f8117e9a40534b9c545408f4a1470 (influxdb:1.1-alpine)
Tagging influxdb:1.1-alpine
Tagging influxdb:1.1.3-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
Using bashbrew/cache:570303402a1cae12ba590264c98e6ace2bd1d09aa843dc8316fcf816baa1e25a (influxdb:1.2)
Tagging influxdb:1.2
Tagging influxdb:1.2.0
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
Using bashbrew/cache:a0e2124fee6c93bd71bb66a05c43c8b2ef2d760ffd72b050e620041b7459c9ea (influxdb:1.2-alpine)
Tagging influxdb:1.2-alpine
Tagging influxdb:1.2.0-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

@tianon tianon merged commit 561037b into docker-library:master Feb 21, 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