From 09da04d35fa9fbf9ee1e77435eb511c893dfa7cc Mon Sep 17 00:00:00 2001
From: Knut Ahlers <knut@ahlers.me>
Date: Tue, 8 May 2018 13:01:08 +0200
Subject: [PATCH] Update debian, improve Dockerfile

Signed-off-by: Knut Ahlers <knut@ahlers.me>
---
 Dockerfile | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index df27116..88796af 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,24 @@
-FROM debian:jessie
+FROM debian:stable
 
 ENV GRAFANA_VERSION 5.1.0
 
-RUN apt-get update \
- && apt-get install -y unzip libfontconfig wget adduser openssl ca-certificates \
- && wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_${GRAFANA_VERSION}_amd64.deb \
- && dpkg -i grafana_${GRAFANA_VERSION}_amd64.deb
+RUN set -ex \
+ && apt-get update \
+ && apt-get install --no-install-recommends -y \
+      adduser \
+      ca-certificates \
+      curl \
+      libfontconfig \
+      openssl \
+      unzip \
+ && curl -sSfLo /tmp/grafana.deb "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_${GRAFANA_VERSION}_amd64.deb" \
+ && dpkg -i /tmp/grafana.deb \
+ && rm /tmp/grafana.deb \
+ && rm -rf /var/lib/apt/lists/*
 
 EXPOSE 3000
 
-VOLUME ["/var/lib/grafana"]
-VOLUME ["/var/log/grafana"]
-VOLUME ["/etc/grafana"]
+VOLUME ["/var/lib/grafana", "/var/log/grafana", "/etc/grafana"]
 
 WORKDIR /usr/share/grafana