This commit is contained in:
Brandon
2019-08-18 09:36:03 -05:00
parent 4a6584f029
commit f98be77201
3 changed files with 17 additions and 15 deletions

View File

@@ -1,7 +1,11 @@
FROM jfloff/alpine-python:2.7 FROM jfloff/alpine-python:2.7
MAINTAINER Log1x <github@log1x.com> 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 WORKDIR /mopidy-iris
RUN \ RUN \
@@ -22,21 +26,17 @@ RUN \
py2-gst@edge \ py2-gst@edge \
py-gobject@edge \ py-gobject@edge \
su-exec \ su-exec \
gstreamer-dev@edge \ gstreamer-tools@edge \
gst-plugins-good@edge \ gst-plugins-good@edge \
gst-plugins-ugly@edge \ gst-plugins-ugly@edge \
&& pip install -U \ && pip install -U \
pyopenssl \ pyopenssl \
youtube-dl \
&& echo "* Installing Mopidy + Extensions" \ && echo "* Installing Mopidy + Extensions" \
&& pip install -U \ && pip install -U \
Mopidy \ Mopidy \
Mopidy-SoundCloud \ Mopidy-Iris \
Mopidy-YouTube \
Mopidy-Local-Images \ Mopidy-Local-Images \
Mopidy-Local-SQLite \ Mopidy-Local-SQLite \
&& echo "* Installing Iris" \
&& pip install -U Mopidy-Iris \
&& echo "* Creating Mopidy User" \ && echo "* Creating Mopidy User" \
&& addgroup -g ${PGID} mopidy \ && addgroup -g ${PGID} mopidy \
&& adduser -h /mopidy -s /bin/sh -D -G mopidy -u ${PUID} mopidy \ && adduser -h /mopidy -s /bin/sh -D -G mopidy -u ${PUID} mopidy \
@@ -44,9 +44,9 @@ RUN \
&& mkdir -p /data \ && mkdir -p /data \
&& chown -R mopidy:mopidy /data \ && chown -R mopidy:mopidy /data \
&& echo "* Ready to start Mopidy" \ && 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 COPY run.sh /usr/local/bin/run.sh
RUN chmod +x /usr/local/bin/run.sh RUN chmod +x /usr/local/bin/run.sh
EXPOSE 6600 6680 5555/udp EXPOSE 6600 6680 5555/udp

View File

@@ -1,6 +1,11 @@
[core] [core]
cache_dir = /data/cache
config_dir = /data/config
data_dir = /data data_dir = /data
[file]
media_dirs = /music|Music
[local] [local]
library = images library = images
media_dir = /music media_dir = /music
@@ -8,14 +13,11 @@ media_dir = /music
[local-images] [local-images]
library = sqlite library = sqlite
[audio]
output = tee name=t ! queue ! autoaudiosink t. ! queue ! udpsink host=0.0.0.0 port=5555
[m3u] [m3u]
playlists_dir = /playlists playlists_dir = /playlists
[http] [http]
hostname = 0.0.0.0 hostname = ::
[mpd] [mpd]
hostname = 0.0.0.0 hostname = ::

2
run.sh
View File

@@ -5,6 +5,6 @@ function stop() {
} }
trap stop HUP INT TERM trap stop HUP INT TERM
su-exec mopidy mopidy --config "${MOPIDY_CONFIG_FILE}" "${@}" & su-exec mopidy mopidy --config "/data/config/mopidy.conf" "${@}" &
PID=$! PID=$!
wait $PID wait $PID