From 841f0b5c25d9648f4f311098c1355c2fa39d591a Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Thu, 1 Aug 2019 14:47:25 +1200
Subject: [PATCH] Adding docker compose to keep mapping easy

---
 Dockerfile-develop |  2 ++
 docker-compose.yml | 11 +++++++++++
 docker/mopidy.conf | 21 +++++++++++++++++----
 3 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 docker-compose.yml

diff --git a/Dockerfile-develop b/Dockerfile-develop
index 3eaa94fd..8d28aa45 100755
--- a/Dockerfile-develop
+++ b/Dockerfile-develop
@@ -41,6 +41,8 @@ RUN set -ex \
  && cd / \
  && mkdir -p /var/lib/mopidy/.config \
  && ln -s /config /var/lib/mopidy/.config/mopidy \
+ # Allow mopidy user to run system commands (restart, local scan, etc)
+ && echo "mopidy ALL=NOPASSWD: /iris/mopidy_iris/system.sh" >> /etc/sudoers \
 # 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 \
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..b98b68f7
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,11 @@
+version: '3'
+services:
+  mopidy:
+    image: jaedb/iris
+    build: 
+      context: ./
+    ports:
+      - 6681:6680
+    volumes:
+      - ./:/iris
+      - /Users/james/Sites/music:/var/lib/mopidy/media
\ No newline at end of file
diff --git a/docker/mopidy.conf b/docker/mopidy.conf
index 028a6040..73f1bdf5 100755
--- a/docker/mopidy.conf
+++ b/docker/mopidy.conf
@@ -1,17 +1,30 @@
 [core]
 data_dir = /var/lib/mopidy
 
-[local]
-media_dir = /var/lib/mopidy/media
-
 [audio]
 output = tee name=t ! queue ! autoaudiosink t. ! queue ! udpsink host=0.0.0.0 port=5555
 
 [m3u]
-playlists_dir = /var/lib/mopidy/playlists
+playlists_dir = /music
 
 [http]
 hostname = 0.0.0.0
 
 [mpd]
 hostname = 0.0.0.0
+
+[local-images]
+library = sqlite
+
+[local]
+library = images
+media_dir = /music
+
+[spotify]
+client_id = babbc426-054c-4949-a4c5-06da85dd4494
+client_secret = Wy8wmKhubiyY1dhbrPSdg92lxX2wMTVGczbVwh89X6Q=
+username = jaedb
+password = swedisH189
+
+[soundcloud]
+auth_token = 1-35204-42997920-d62091fd310537a