Updating with pykka

This commit is contained in:
James Barnsley
2019-08-01 07:56:14 +12:00
parent 587cbb05b3
commit eef6d07f0e
4 changed files with 47 additions and 43 deletions

42
Dockerfile Normal file → Executable file
View File

@ -5,41 +5,43 @@ RUN set -ex \
# (see https://docs.mopidy.com/en/latest/installation/debian/ ) # (see https://docs.mopidy.com/en/latest/installation/debian/ )
&& apt-get update \ && apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \
curl \ curl \
dumb-init \ dumb-init \
gcc \ gcc \
gnupg \ gnupg \
gstreamer1.0-alsa \ gstreamer1.0-alsa \
gstreamer1.0-plugins-bad \ gstreamer1.0-plugins-bad \
python-crypto \ python-crypto \
python-pykka \ python-pykka \
&& curl -L https://apt.mopidy.com/mopidy.gpg | apt-key add - \ && 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 \ && curl -L https://apt.mopidy.com/mopidy.list -o /etc/apt/sources.list.d/mopidy.list \
&& apt-get update \ && apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \
mopidy \ mopidy \
mopidy-soundcloud \ mopidy-soundcloud \
mopidy-spotify \ mopidy-spotify \
&& curl -L https://bootstrap.pypa.io/get-pip.py | python - \ && curl -L https://bootstrap.pypa.io/get-pip.py | python - \
&& pip install -U six pyasn1 requests[security] cryptography \ && pip install -U six pyasn1 requests[security] cryptography \
&& pip install \ && pip install \
Mopidy-Local-Images \ Mopidy-Iris \
Mopidy-Local-SQLite \ Mopidy-Moped \
Mopidy-GMusic \ Mopidy-GMusic \
pyopenssl \ Mopidy-Pandora \
youtube-dl \ Mopidy-YouTube \
mopidy-iris \ pyopenssl \
youtube-dl \
&& mkdir -p /var/lib/mopidy/.config \
&& ln -s /config /var/lib/mopidy/.config/mopidy \
# Install Snapcast # Install Snapcast
# This is the most reliable way to get audio out of a Docker instance. # 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 \ && 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 \ && dpkg -i snapserver.deb \
&& touch /etc/default/snapserver \ && touch /etc/default/snapserver \
&& apt-get -f install \ && apt-get -f install \
# Clean-up # Clean-up
&& apt-get purge --auto-remove -y \ && apt-get purge --auto-remove -y \
curl \ curl \
gcc \ gcc \
git \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.cache && 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"] 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"] ENTRYPOINT ["/usr/bin/dumb-init", "/entrypoint.sh"]
CMD ["/usr/bin/mopidy"] CMD ["/usr/bin/mopidy"]

46
Dockerfile-develop Normal file → Executable file
View File

@ -4,33 +4,36 @@ FROM debian:stretch-slim
COPY . /iris COPY . /iris
RUN set -ex \ RUN set -ex \
# Official Mopidy install for Debian/Ubuntu along with some extensions # Official Mopidy install for Debian/Ubuntu along with some extensions
# (see https://docs.mopidy.com/en/latest/installation/debian/ ) # (see https://docs.mopidy.com/en/latest/installation/debian/ )
&& apt-get update \ && apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \
curl \ curl \
dumb-init \ dumb-init \
gcc \ gcc \
gnupg \ gnupg \
gstreamer1.0-alsa \ gstreamer1.0-alsa \
gstreamer1.0-plugins-bad \ gstreamer1.0-plugins-bad \
python-crypto \ python-crypto \
python-pykka \ python-pykka \
&& curl -L https://apt.mopidy.com/mopidy.gpg | apt-key add - \ && 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 \ && curl -L https://apt.mopidy.com/mopidy.list -o /etc/apt/sources.list.d/mopidy.list \
&& apt-get update \ && apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \
mopidy \ mopidy \
mopidy-soundcloud \ mopidy-soundcloud \
mopidy-spotify \ mopidy-spotify \
&& curl -L https://bootstrap.pypa.io/get-pip.py | python - \ && curl -L https://bootstrap.pypa.io/get-pip.py | python - \
&& pip install -U six pyasn1 requests[security] cryptography \ && pip install -U six pyasn1 requests[security] cryptography \
&& pip install \ && pip install \
Mopidy-Local-Images \ Mopidy-Local-Images \
Mopidy-Local-SQLite \ Mopidy-Local-SQLite \
Mopidy-GMusic \ Mopidy-Moped \
pyopenssl \ Mopidy-GMusic \
youtube-dl \ Mopidy-Pandora \
Mopidy-YouTube \
pyopenssl \
youtube-dl \
# Clone Iris from current directory and install in development mode. # Clone Iris from current directory and install in development mode.
# This allows a binding at "/iris" to map to your local folder for development. # This allows a binding at "/iris" to map to your local folder for development.
&& cd /iris \ && cd /iris \
@ -46,9 +49,8 @@ RUN set -ex \
&& apt-get -f install \ && apt-get -f install \
# Clean-up # Clean-up
&& apt-get purge --auto-remove -y \ && apt-get purge --auto-remove -y \
curl \ curl \
gcc \ gcc \
git \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.cache && 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"] 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"] ENTRYPOINT ["/usr/bin/dumb-init", "/entrypoint.sh"]
CMD ["/usr/bin/mopidy"] CMD ["/usr/bin/mopidy"]

2
docker/mopidy.conf Normal file → Executable file
View File

@ -5,7 +5,7 @@ data_dir = /var/lib/mopidy
media_dir = /var/lib/mopidy/media media_dir = /var/lib/mopidy/media
[audio] [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] [m3u]
playlists_dir = /var/lib/mopidy/playlists playlists_dir = /var/lib/mopidy/playlists

0
docker/pulse-client.conf Normal file → Executable file
View File