From 42251366a032dafbbbc4c35f1af60fed24a280d1 Mon Sep 17 00:00:00 2001 From: Bram Mittendorff Date: Tue, 18 Feb 2020 11:11:04 +0100 Subject: [PATCH] Added pinning of apt packages and Updated Mopidy-Iris (#22) * Update requirements.txt For python3 * Update Dockerfile For python3 * Added latest ubuntu image * Updated images to debian instead of ubuntu for python 3.7 needed for mopidy * Added mopidy local and deps * Removed a few gstreamer plugins that were not used * To develop make use of the development branch of iris so we can see it actualy work * Updated dependencies * Updated to 3.44.0 * Changed Iris to get from pypi version 3.44.0 * Bumped debian-base to v3.0.0 * Added error log and access log * Updated mopidy-iris * Added pinning for packages --- mopidy/Dockerfile | 36 +++++++++++++++++++----------------- mopidy/requirements.txt | 2 +- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/mopidy/Dockerfile b/mopidy/Dockerfile index 21e8fc0..6503bec 100755 --- a/mopidy/Dockerfile +++ b/mopidy/Dockerfile @@ -27,22 +27,22 @@ RUN \ && apt-get update \ \ && apt-get install -y --no-install-recommends \ - libffi-dev \ - libxml2-dev \ - libxslt1-dev \ - libasound2-dev \ - libspotify12 \ - libspotify-dev \ - zlib1g-dev \ - build-essential \ - python3-dev \ - python3-gi \ - python3-gst-1.0 \ - gstreamer1.0-alsa \ - gstreamer1.0-plugins-bad \ - gstreamer1.0-plugins-good \ - gstreamer1.0-plugins-ugly \ - gstreamer1.0-pulseaudio \ + libffi-dev=3.2.1-9 \ + libxml2-dev=2.9.4+dfsg1-7+b3 \ + libxslt1-dev=1.1.32-2.2~deb10u1 \ + libasound2-dev=1.1.8-1 \ + libspotify12=12.1.51-1 \ + libspotify-dev=12.1.51-1 \ + zlib1g-dev=1:1.2.11.dfsg-1 \ + build-essential=12.6 \ + python3-dev=3.7.3-1 \ + python3-gi=3.30.4-1 \ + python3-gst-1.0=1.14.4-1+b1 \ + gstreamer1.0-alsa=1.14.4-2 \ + gstreamer1.0-plugins-bad=1.14.4-1+b1 \ + gstreamer1.0-plugins-good=1.14.4-1 \ + gstreamer1.0-plugins-ugly=1.14.4-1 \ + gstreamer1.0-pulseaudio=1.14.4-1 \ \ && luarocks install lua-resty-http 0.13-0 \ \ @@ -65,7 +65,9 @@ RUN \ zlib1g-dev \ build-essential \ gcc \ - python-dev \ + python3-dev \ + python3-gi \ + python3-gst-1.0 \ dpkg-dev \ gcc-7 \ luarocks \ diff --git a/mopidy/requirements.txt b/mopidy/requirements.txt index 1b2ea9f..c2d83b2 100644 --- a/mopidy/requirements.txt +++ b/mopidy/requirements.txt @@ -3,7 +3,7 @@ Pykka==2.0.2 Mopidy-Local==3.1.1 Mopidy-AlsaMixer==2.0.0 Mopidy-Spotify==4.0.1 -Mopidy-Iris==3.44.0 +Mopidy-Iris==3.44.3 Mopidy-SoundCloud==3.0.0 Mopidy-GMusic==4.0.0 Mopidy-Youtube==3.0a1 \ No newline at end of file