From eef6d07f0eb083939bac01adff2394858eccdbee Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Thu, 1 Aug 2019 07:56:14 +1200
Subject: [PATCH] Updating with pykka

---
 Dockerfile               | 42 +++++++++++++++++++-----------------
 Dockerfile-develop       | 46 +++++++++++++++++++++-------------------
 docker/mopidy.conf       |  2 +-
 docker/pulse-client.conf |  0
 4 files changed, 47 insertions(+), 43 deletions(-)
 mode change 100644 => 100755 Dockerfile
 mode change 100644 => 100755 Dockerfile-develop
 mode change 100644 => 100755 docker/mopidy.conf
 mode change 100644 => 100755 docker/pulse-client.conf

diff --git a/Dockerfile b/Dockerfile
old mode 100644
new mode 100755
index 19c54af4..942c742f
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,41 +5,43 @@ RUN set -ex \
     # (see https://docs.mopidy.com/en/latest/installation/debian/ )
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-       curl \
-       dumb-init \
-       gcc \
-       gnupg \
-       gstreamer1.0-alsa \
-       gstreamer1.0-plugins-bad \
-       python-crypto \
-       python-pykka \
+        curl \
+        dumb-init \
+        gcc \
+        gnupg \
+        gstreamer1.0-alsa \
+        gstreamer1.0-plugins-bad \
+        python-crypto \
+        python-pykka \
  && curl -L https://apt.mopidy.com/mopidy.gpg | apt-key add - \
  && curl -L https://apt.mopidy.com/mopidy.list -o /etc/apt/sources.list.d/mopidy.list \
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-       mopidy \
-       mopidy-soundcloud \
-       mopidy-spotify \
+        mopidy \
+        mopidy-soundcloud \
+        mopidy-spotify \
  && curl -L https://bootstrap.pypa.io/get-pip.py | python - \
  && pip install -U six pyasn1 requests[security] cryptography \
  && pip install \
-       Mopidy-Local-Images \
-       Mopidy-Local-SQLite \
-       Mopidy-GMusic \
-       pyopenssl \
-       youtube-dl \
-       mopidy-iris \
+        Mopidy-Iris \
+        Mopidy-Moped \
+        Mopidy-GMusic \
+        Mopidy-Pandora \
+        Mopidy-YouTube \
+        pyopenssl \
+        youtube-dl \
+ && mkdir -p /var/lib/mopidy/.config \
+ && ln -s /config /var/lib/mopidy/.config/mopidy \
 # Install Snapcast
 # This is the most reliable way to get audio out of a Docker instance.
  && curl -L https://github.com/badaix/snapcast/releases/download/v0.15.0/snapserver_0.15.0_amd64.deb -o snapserver.deb \
  && dpkg -i snapserver.deb \
  && touch /etc/default/snapserver \
  && apt-get -f install \
-# Clean-up
+    # Clean-up
  && apt-get purge --auto-remove -y \
         curl \
         gcc \
-        git \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.cache
 
@@ -64,7 +66,7 @@ USER mopidy
 
 VOLUME ["/var/lib/mopidy/local", "/var/lib/mopidy/media"]
 
-EXPOSE 6600 6680 1705 5555/udp
+EXPOSE 6600 6680 5555/udp
 
 ENTRYPOINT ["/usr/bin/dumb-init", "/entrypoint.sh"]
 CMD ["/usr/bin/mopidy"]
diff --git a/Dockerfile-develop b/Dockerfile-develop
old mode 100644
new mode 100755
index 12f94e54..3eaa94fd
--- a/Dockerfile-develop
+++ b/Dockerfile-develop
@@ -4,33 +4,36 @@ FROM debian:stretch-slim
 COPY . /iris
 
 RUN set -ex \
-    # Official Mopidy install for Debian/Ubuntu along with some extensions
-    # (see https://docs.mopidy.com/en/latest/installation/debian/ )
+# Official Mopidy install for Debian/Ubuntu along with some extensions
+# (see https://docs.mopidy.com/en/latest/installation/debian/ )
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-        curl \
-        dumb-init \
-        gcc \
-        gnupg \
-        gstreamer1.0-alsa \
-        gstreamer1.0-plugins-bad \
-        python-crypto \
-        python-pykka \
+       curl \
+       dumb-init \
+       gcc \
+       gnupg \
+       gstreamer1.0-alsa \
+       gstreamer1.0-plugins-bad \
+       python-crypto \
+       python-pykka \
  && curl -L https://apt.mopidy.com/mopidy.gpg | apt-key add - \
  && curl -L https://apt.mopidy.com/mopidy.list -o /etc/apt/sources.list.d/mopidy.list \
  && apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-        mopidy \
-        mopidy-soundcloud \
-        mopidy-spotify \
+       mopidy \
+       mopidy-soundcloud \
+       mopidy-spotify \
  && curl -L https://bootstrap.pypa.io/get-pip.py | python - \
  && pip install -U six pyasn1 requests[security] cryptography \
  && pip install \
-        Mopidy-Local-Images \
-        Mopidy-Local-SQLite \
-        Mopidy-GMusic \
-        pyopenssl \
-        youtube-dl \
+       Mopidy-Local-Images \
+       Mopidy-Local-SQLite \
+       Mopidy-Moped \
+       Mopidy-GMusic \
+       Mopidy-Pandora \
+       Mopidy-YouTube \
+       pyopenssl \
+       youtube-dl \
  # Clone Iris from current directory and install in development mode.
  # This allows a binding at "/iris" to map to your local folder for development.
  && cd /iris \
@@ -46,9 +49,8 @@ RUN set -ex \
  && apt-get -f install \
 # Clean-up
  && apt-get purge --auto-remove -y \
-        curl \
-        gcc \
-        git \
+       curl \
+       gcc \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.cache
 
@@ -73,7 +75,7 @@ USER mopidy
 
 VOLUME ["/var/lib/mopidy/local", "/var/lib/mopidy/media"]
 
-EXPOSE 6600 6680 1705 5555/udp
+EXPOSE 6600 6680 5555/udp
 
 ENTRYPOINT ["/usr/bin/dumb-init", "/entrypoint.sh"]
 CMD ["/usr/bin/mopidy"]
diff --git a/docker/mopidy.conf b/docker/mopidy.conf
old mode 100644
new mode 100755
index ea6ef409..028a6040
--- a/docker/mopidy.conf
+++ b/docker/mopidy.conf
@@ -5,7 +5,7 @@ data_dir = /var/lib/mopidy
 media_dir = /var/lib/mopidy/media
 
 [audio]
-#output = tee name=t ! queue ! autoaudiosink t. ! queue ! udpsink host=0.0.0.0 port=5555
+output = tee name=t ! queue ! autoaudiosink t. ! queue ! udpsink host=0.0.0.0 port=5555
 
 [m3u]
 playlists_dir = /var/lib/mopidy/playlists
diff --git a/docker/pulse-client.conf b/docker/pulse-client.conf
old mode 100644
new mode 100755