From f98be7720178fd0c809adc19b642482d7872f2bc Mon Sep 17 00:00:00 2001
From: Brandon <brandon@tendency.me>
Date: Sun, 18 Aug 2019 09:36:03 -0500
Subject: [PATCH] Bump

---
 Dockerfile  | 18 +++++++++---------
 mopidy.conf | 12 +++++++-----
 run.sh      |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f3d68db..bafacdd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,11 @@
 FROM jfloff/alpine-python:2.7
 MAINTAINER Log1x <github@log1x.com>
 
-ENV PGID=1000 PUID=1000
+ENV PUID="${PUID:-1000}"
+ENV PGID="${PGID:-1000}"
+
+ENV PYTHONPATH="/usr/local/lib/python2.7/site-packages:/usr/lib/python2.7/site-packages"
+
 WORKDIR /mopidy-iris
 
 RUN \
@@ -22,21 +26,17 @@ RUN \
       py2-gst@edge \
       py-gobject@edge \
       su-exec \
-      gstreamer-dev@edge \
+      gstreamer-tools@edge \
       gst-plugins-good@edge \
       gst-plugins-ugly@edge \
     && pip install -U \
       pyopenssl \
-      youtube-dl \
   && echo "* Installing Mopidy + Extensions" \
     && pip install -U \
       Mopidy \
-      Mopidy-SoundCloud \
-      Mopidy-YouTube \
+      Mopidy-Iris \
       Mopidy-Local-Images \
       Mopidy-Local-SQLite \
-  && echo "* Installing Iris" \
-    && pip install -U Mopidy-Iris \
   && echo "* Creating Mopidy User" \
     && addgroup -g ${PGID} mopidy \
     && adduser -h /mopidy -s /bin/sh -D -G mopidy -u ${PUID} mopidy \
@@ -44,9 +44,9 @@ RUN \
     && mkdir -p /data \
     && chown -R mopidy:mopidy /data \
   && echo "* Ready to start Mopidy" \
-  && sleep 10
+  && sleep 1
 
-COPY   mopidy.conf /config/mopidy.conf
+COPY   mopidy.conf /data/config/mopidy.conf
 COPY   run.sh /usr/local/bin/run.sh
 RUN    chmod +x /usr/local/bin/run.sh
 EXPOSE 6600 6680 5555/udp
diff --git a/mopidy.conf b/mopidy.conf
index 3ac8550..f4ce86f 100755
--- a/mopidy.conf
+++ b/mopidy.conf
@@ -1,6 +1,11 @@
 [core]
+cache_dir = /data/cache
+config_dir = /data/config
 data_dir = /data
 
+[file]
+media_dirs = /music|Music
+
 [local]
 library = images
 media_dir = /music
@@ -8,14 +13,11 @@ media_dir = /music
 [local-images]
 library = sqlite
 
-[audio]
-output = tee name=t ! queue ! autoaudiosink t. ! queue ! udpsink host=0.0.0.0 port=5555
-
 [m3u]
 playlists_dir = /playlists
 
 [http]
-hostname = 0.0.0.0
+hostname = ::
 
 [mpd]
-hostname = 0.0.0.0
+hostname = ::
diff --git a/run.sh b/run.sh
index 99c8bd6..c09afd9 100755
--- a/run.sh
+++ b/run.sh
@@ -5,6 +5,6 @@ function stop() {
 }
 
 trap stop HUP INT TERM
-su-exec mopidy mopidy --config "${MOPIDY_CONFIG_FILE}" "${@}" &
+su-exec mopidy mopidy --config "/data/config/mopidy.conf" "${@}" &
 PID=$!
 wait $PID