From 950883a3eedf35a3e6a1182c15a79818839f1027 Mon Sep 17 00:00:00 2001
From: Werner Beroux <werner@beroux.com>
Date: Mon, 9 Nov 2015 09:06:46 +0100
Subject: [PATCH] Reduce the number of layers.

---
 Dockerfile | 56 +++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3eaf27d..af02a36 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,39 +2,39 @@ FROM debian:jessie
 
 MAINTAINER Werner Beroux <werner@beroux.com>
 
-# Official Mopidy install for Debian/Ubuntu along with some extensions
-# (see https://docs.mopidy.com/en/latest/installation/debian/ )
-ADD https://apt.mopidy.com/mopidy.gpg /tmp/mopidy.gpg
-ADD https://apt.mopidy.com/mopidy.list /etc/apt/sources.list.d/mopidy.list
-
-RUN apt-key add /tmp/mopidy.gpg
-
-RUN apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-        curl \
-        mopidy \
-        mopidy-soundcloud \
-        mopidy-spotify \
-        gstreamer0.10-alsa \
-        python-crypto \
-    && curl -L https://bootstrap.pypa.io/get-pip.py | python - \
-    && pip install -U six \
-    && pip install \
-        Mopidy-Moped \
-        Mopidy-GMusic \
-        Mopidy-YouTube \
-    && apt-get purge --auto-remove -y \
-        curl \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.cache
-
 # Default configuration
 ADD mopidy.conf /var/lib/mopidy/.config/mopidy/mopidy.conf
-RUN chown mopidy:audio -R /var/lib/mopidy/.config
 
 # Start helper script
 ADD entrypoint.sh /entrypoint.sh
-RUN chown mopidy:audio /entrypoint.sh
+
+# Official Mopidy install for Debian/Ubuntu along with some extensions
+# (see https://docs.mopidy.com/en/latest/installation/debian/ )
+RUN apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+        curl \
+        gstreamer0.10-alsa \
+        python-crypto \
+ && curl -L https://apt.mopidy.com/mopidy.gpg -o /tmp/mopidy.gpg \
+ && curl -L https://apt.mopidy.com/mopidy.list -o /etc/apt/sources.list.d/mopidy.list \
+ && apt-key add /tmp/mopidy.gpg \
+ && apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+        mopidy \
+        mopidy-soundcloud \
+        mopidy-spotify \
+ && curl -L https://bootstrap.pypa.io/get-pip.py | python - \
+ && pip install -U six \
+ && pip install \
+        Mopidy-Moped \
+        Mopidy-GMusic \
+        Mopidy-YouTube \
+ && apt-get purge --auto-remove -y \
+        curl \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.cache \
+ && chown mopidy:audio -R /var/lib/mopidy/.config \
+ && chown mopidy:audio /entrypoint.sh
 
 # Run as mopidy user
 USER mopidy