From 6bf605789ae58a35d5d0f85890a031e4e8325635 Mon Sep 17 00:00:00 2001
From: Alex Ellis <alexellis2@gmail.com>
Date: Mon, 5 Feb 2018 08:23:49 +0000
Subject: [PATCH] Rename arm contrib files

Signed-off-by: Alex Ellis <alexellis2@gmail.com>
---
 .../prometheus-arm64/{ => 1.5.2}/Dockerfile   |  2 +-
 .../2.1/Dockerfile                            |  0
 .../2.0/Dockerfile                            |  0
 contrib/prometheus-armhf/2.1/Dockerfile       | 31 +++++++++++++++++++
 4 files changed, 32 insertions(+), 1 deletion(-)
 rename contrib/prometheus-arm64/{ => 1.5.2}/Dockerfile (97%)
 rename contrib/{prometheus => prometheus-arm64}/2.1/Dockerfile (100%)
 rename contrib/{prometheus => prometheus-armhf}/2.0/Dockerfile (100%)
 create mode 100644 contrib/prometheus-armhf/2.1/Dockerfile

diff --git a/contrib/prometheus-arm64/Dockerfile b/contrib/prometheus-arm64/1.5.2/Dockerfile
similarity index 97%
rename from contrib/prometheus-arm64/Dockerfile
rename to contrib/prometheus-arm64/1.5.2/Dockerfile
index ad9acb1f..7c41b763 100644
--- a/contrib/prometheus-arm64/Dockerfile
+++ b/contrib/prometheus-arm64/1.5.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM arm64v8/alpine:3.5
+FROM alpine:3.6
 
 workdir /root
 RUN apk add --update libarchive-tools
diff --git a/contrib/prometheus/2.1/Dockerfile b/contrib/prometheus-arm64/2.1/Dockerfile
similarity index 100%
rename from contrib/prometheus/2.1/Dockerfile
rename to contrib/prometheus-arm64/2.1/Dockerfile
diff --git a/contrib/prometheus/2.0/Dockerfile b/contrib/prometheus-armhf/2.0/Dockerfile
similarity index 100%
rename from contrib/prometheus/2.0/Dockerfile
rename to contrib/prometheus-armhf/2.0/Dockerfile
diff --git a/contrib/prometheus-armhf/2.1/Dockerfile b/contrib/prometheus-armhf/2.1/Dockerfile
new file mode 100644
index 00000000..744ed236
--- /dev/null
+++ b/contrib/prometheus-armhf/2.1/Dockerfile
@@ -0,0 +1,31 @@
+FROM alpine:3.6
+WORKDIR /root/
+
+RUN apk add --update libarchive-tools curl \
+    && curl -sLf https://github.com/prometheus/prometheus/releases/download/v2.1.0/prometheus-2.1.0.linux-armv7.tar.gz > prometheus.tar.gz \
+    && bsdtar -xvf prometheus.tar.gz -C ./ --strip-components=1 \
+    && apk del libarchive-tools curl \
+    && mkdir /etc/prometheus \
+    && mkdir -p /usr/share/prometheus \
+    && cp prometheus                             /bin/prometheus \
+    && cp promtool                               /bin/promtool \
+    && cp prometheus.yml  				/etc/prometheus/ \
+    && cp -r console_libraries                     /usr/share/prometheus/ \
+    && cp -r consoles                              /usr/share/prometheus/ \
+    && rm -rf /root/*
+
+RUN ln -s /usr/share/prometheus/console_libraries /usr/share/prometheus/consoles/ /etc/prometheus/
+RUN mkdir -p /prometheus && \
+    chown -R nobody:nogroup /etc/prometheus /prometheus
+
+USER       nobody
+EXPOSE     9090
+VOLUME     [ "/prometheus" ]
+WORKDIR    /prometheus
+ENTRYPOINT [ "/bin/prometheus" ]
+CMD        [ "--config.file=/etc/prometheus/prometheus.yml", \
+             "--storage.tsdb.path=/prometheus", \
+             "--web.console.libraries=/usr/share/prometheus/console_libraries", \
+             "--web.console.templates=/usr/share/prometheus/consoles" ]
+
+