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

Fix chronograf image for ARM architecture #3482

Merged
merged 1 commit into from
Sep 21, 2017

Conversation

jsternberg
Copy link
Contributor

No description provided.

@tianon
Copy link
Member

tianon commented Sep 21, 2017

Diff:
warning: insecure protocol git:// detected: git://github.com/influxdata/influxdata-docker
diff --git a/chronograf_latest/Dockerfile b/chronograf_latest/Dockerfile
index 3ca1289..e5275ee 100644
--- a/chronograf_latest/Dockerfile
+++ b/chronograf_latest/Dockerfile
@@ -23,11 +23,11 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" && \
     set -x && \
     apt-get update && apt-get install -y ca-certificates curl --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* && \
+    curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc" && \
+    curl -SLO "https://dl.influxdata.com/chronograf/releases/chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb" && \
+    gpg --batch --verify chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb.asc chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
+    dpkg -i chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb && \
+    rm -f chronograf_${CHRONOGRAF_VERSION}_${ARCH}.deb* && \
     apt-get purge -y --auto-remove $buildDeps
 
 COPY LICENSE /usr/share/chronograf/LICENSE

@tianon
Copy link
Member

tianon commented Sep 21, 2017

LGTM

warning: insecure protocol git:// detected: git://github.com/influxdata/influxdata-docker
Build test of #3482; 05016ac (chronograf, influxdb, kapacitor, telegraf):

$ bashbrew build chronograf:1.3
Building bashbrew/cache:7aaeef5c4d3cf6acd23a1e6a5592fff74fb05c3e86c19bb32f11df46266bcb10 (chronograf:1.3)
Tagging chronograf:1.3
Tagging chronograf:1.3.8
Tagging chronograf:1.3.8.1
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:c64a6df1b2e324178cd5659adbf61c998267e98fc41805d3e284f17ff9e1c090 (chronograf:1.3-alpine)
Tagging chronograf:1.3-alpine
Tagging chronograf:1.3.8-alpine
Tagging chronograf:1.3.8.1-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.2
Building bashbrew/cache:6ae24d2e9d93145484025c8732ca9f3b69299b6ebabf2e709ad92a94fc0fd6c9 (influxdb:1.2)
Tagging influxdb:1.2
Tagging influxdb:1.2.4

$ 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:27ba86b36c32d1bd0fcf0aa366c6382810488a5489f214d691dc522f22a55b6e (influxdb:1.2-alpine)
Tagging influxdb:1.2-alpine
Tagging influxdb:1.2.4-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 influxdb:1.3
Building bashbrew/cache:1377b3aafd2c630765f82b0565bffb0078fb4bab651ad576c7bd0dc4e8114416 (influxdb:1.3)
Tagging influxdb:1.3
Tagging influxdb:1.3.5
Tagging influxdb:latest

$ test/run.sh influxdb:1.3
testing influxdb: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 influxdb:1.3-alpine
Building bashbrew/cache:4cc3396e4e5729435d3536f55302e10a689be2258125bb6b9998f3588d504627 (influxdb:1.3-alpine)
Tagging influxdb:1.3-alpine
Tagging influxdb:1.3.5-alpine
Tagging influxdb:alpine

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

$ 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:2dd7f9474e8b4c282582bdbf945df339dae82907e75d4b113fd17ebf7a37f421 (kapacitor:1.2-alpine)
Tagging kapacitor:1.2-alpine
Tagging kapacitor:1.2.1-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 kapacitor:1.3
Building bashbrew/cache:2ec576aed4a16dfc8c94d3c2d39d663bfcafd357ae42f40a9e113e19848fcfe4 (kapacitor:1.3)
Tagging kapacitor:1.3
Tagging kapacitor:1.3.3
Tagging kapacitor:latest

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

$ test/run.sh kapacitor:1.3-alpine
testing kapacitor: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 telegraf:1.3
Building bashbrew/cache:1629b9292d981b7d3717cf59dcb1810114f67b73526f50c6d5edc3256311a572 (telegraf:1.3)
Tagging telegraf:1.3
Tagging telegraf:1.3.5

$ 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:c6dff8768c7ff5f69c484f3a137d6a9e042202d01715d33c77c712c86206a7d7 (telegraf:1.3-alpine)
Tagging telegraf:1.3-alpine
Tagging telegraf:1.3.5-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


$ bashbrew build telegraf:1.4
Building bashbrew/cache:10dad676f436ae7a3b242618a93fc5cf53b3d88a42b0c260ac044a7e345a435f (telegraf:1.4)
Tagging telegraf:1.4
Tagging telegraf:1.4.0
Tagging telegraf:latest

$ test/run.sh telegraf:1.4
testing telegraf:1.4
	'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.4-alpine
Building bashbrew/cache:762f0f51cf3613881753dd900d9890bcd166686a447fb14b0a425a5742c09e94 (telegraf:1.4-alpine)
Tagging telegraf:1.4-alpine
Tagging telegraf:1.4.0-alpine
Tagging telegraf:alpine

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

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.

2 participants