Merge branch 'master' into develop

.gitignore

@@ -19,6 +19,7 @@ docker/snapserver/snapserver.json
 docker/snapserver/meta_mopidy.py
 docker/mopidy/mopidy.conf
 docker/mopidy/iris/
+docker/mopidy/m3u/
 docker/mopidy/icecast2.xml
 docker/jellyfin/
 docker-compose.yml

Dockerfile

@@ -52,17 +52,16 @@ RUN git clone --depth 1 -b master https://github.com/jaedb/Iris.git /iris \
 RUN python3 -m pip install --no-cache \
   tox \
   mopidy-mpd \
-  mopidy-local \
-  dbus-python
+  mopidy-local
 
 # Start helper script.
 COPY docker/entrypoint.sh /entrypoint.sh
 
 # Default configuration.
-COPY docker/mopidy.example.conf /config/mopidy.conf
+COPY docker/mopidy/mopidy.example.conf /config/mopidy.conf
 
 # Copy the pulse-client configuratrion.
-COPY docker/pulse-client.conf /etc/pulse/client.conf
+COPY docker/mopidy/pulse-client.conf /etc/pulse/client.conf
 
 # Add version info to image
 COPY VERSION /

package-lock.json

@@ -12343,9 +12343,9 @@
           }
         },
         "loader-utils": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "version": "1.4.2",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+          "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
           "dev": true,
           "requires": {
             "big.js": "^5.2.2",