From fb72d74f024fb82a30e1831ccb8f844cbd6f694f Mon Sep 17 00:00:00 2001
From: john30 <ebusd@ebusd.eu>
Date: Sat, 4 Feb 2017 14:59:53 +0100
Subject: [PATCH] follow docker guidelines

---
 contrib/docker/runtime/Dockerfile | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/contrib/docker/runtime/Dockerfile b/contrib/docker/runtime/Dockerfile
index 324efa8f..37af7d88 100644
--- a/contrib/docker/runtime/Dockerfile
+++ b/contrib/docker/runtime/Dockerfile
@@ -1,20 +1,24 @@
 FROM debian
 
-RUN apt-get update
-RUN apt-get install -y curl libmosquitto1
+RUN apt-get update && apt-get install -y \
+    libmosquitto1 \
+    curl
 
 LABEL maintainer "ebusd@ebusd.eu"
 
+ENV EBUSD_VERSION 3.0pre
+ENV EBUSD_ARCH amd64
+
+LABEL version "${EBUSD_VERSION}-${EBUSD_ARCH}-mqtt1"
+
+COPY ebusd-${EBUSD_VERSION}_${EBUSD_ARCH}_mqtt1.deb ebusd.deb
+
+RUN dpkg -i ebusd.deb
+
 RUN mkdir /etc/ebusd \
     && curl -SL https://github.com/john30/ebusd-configuration/archive/master.tar.gz \
     | tar xz --strip-components=3 -C /etc/ebusd ebusd-configuration-master/ebusd-2.1.x/de
 
-ENV EBUSD_VERSION 3.0pre
-ENV EBUSD_ARCH amd64
-COPY ebusd-${EBUSD_VERSION}_${EBUSD_ARCH}_mqtt1.deb ebusd.deb
-
-RUN dpkg -i ebusd.deb
-
 EXPOSE 8888
 
 COPY docker-entrypoint.sh /