Update mopidy to 3.0 and python from 2 to 3.7 (#20)

* 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

.gitlab-ci.yml

@@ -10,6 +10,6 @@ variables:
   ADDON_ARMHF: "false"
   ADDON_AARCH64: "false"
 
-  ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:3.1.2"
+  ADDON_AMD64_BASE: "hassioaddons/debian-base-amd64:3.0.0"
-  ADDON_ARMV7_BASE: "hassioaddons/ubuntu-base-armv7:3.1.2"
+  ADDON_ARMV7_BASE: "hassioaddons/debian-base-armv7:3.0.0"
-  ADDON_I386_BASE: "hassioaddons/ubuntu-base-i386:3.1.2"
+  ADDON_I386_BASE: "hassioaddons/debian-base-i386:3.0.0"

mopidy/Dockerfile

@@ -1,4 +1,4 @@
-ARG BUILD_FROM=hassioaddons/ubuntu-base:3.1.2
+ARG BUILD_FROM=hassioaddons/debian-base:3.0.0
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
@@ -13,14 +13,13 @@ RUN \
     apt-get update \
     \
     && apt-get install -y --no-install-recommends \
-        libssl1.1=1.1.1-1ubuntu2.1~18.04.2 \
+        dirmngr \
-    && apt-get install -y --no-install-recommends \
+        gpg-agent \
-        dirmngr=2.2.4-1ubuntu1.2 \
+        gpg \
-        gpg-agent=2.2.4-1ubuntu1.2 \
+        libnginx-mod-http-lua \
-        gpg=2.2.4-1ubuntu1.2 \
+        luarocks \
-        libnginx-mod-http-lua=1.14.0-0ubuntu1.2 \
+        nginx \
-        luarocks=2.4.2+dfsg-1 \
+        git \
-        nginx=1.14.0-0ubuntu1.2 \
     \
     && 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 \
@@ -28,55 +27,56 @@ RUN \
     && apt-get update \
     \
     && apt-get install -y --no-install-recommends \
-        build-essential=12.4ubuntu1 \
-        gstreamer1.0-alsa=1.14.1-1ubuntu1~ubuntu18.04.2 \
-        gstreamer1.0-plugins-bad=1.14.1-1ubuntu1~ubuntu18.04.1 \
-        gstreamer1.0-pulseaudio=1.14.1-1ubuntu1~ubuntu18.04.1 \
-        libffi-dev=3.2.1-8 \
-        libxml2-dev=2.9.4+dfsg1-6.1ubuntu1.2 \
-        libxslt1-dev=1.1.29-5ubuntu0.1 \
-        mopidy-alsamixer=1.0.3-3 \
-        mopidy-local-sqlite=1.0.0-2 \
-        mopidy-spotify-tunigo=1.0.0-0mopidy1 \
-        mopidy-spotify=3.1.0-0mopidy1 \
-        mopidy=2.2.2-1 \
-        python-dev=2.7.15~rc1-1 \
-        zlib1g-dev=1:1.2.11.dfsg-0ubuntu2 \
-    \
-    && luarocks install lua-resty-http 0.13-0 \
-    \
-    && curl https://bootstrap.pypa.io/get-pip.py | python \
-    && pip install --no-cache-dir -r /tmp/requirements.txt \
-    \
-    && find /usr/local/lib/python2.7/ -type d -name tests -depth -exec rm -rf {} \; \
-    && find /usr/local/lib/python2.7/ -type d -name test -depth -exec rm -rf {} \; \
-    && find /usr/local/lib/python2.7/ -name __pycache__ -depth -exec rm -rf {} \; \
-    && find /usr/local/lib/python2.7/ -name "*.pyc" -depth -exec rm -f {} \; \
-    \
-    && apt-get purge -y --auto-remove \
-        build-essential \
-        dirmngr \
-        dpkg-dev \
-        gcc \
-        gcc-7 \
-        gpg \
-        gpg-agent \
         libffi-dev \
         libxml2-dev \
         libxslt1-dev \
-        luarocks \
+        libasound2-dev \
-        python-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 \
     \
-    && find /tmp/ -mindepth 1  -delete \
+    && luarocks install lua-resty-http 0.13-0 \
+    \
+    && curl https://bootstrap.pypa.io/get-pip.py | python3 \
+    && pip3 install --no-cache-dir -r /tmp/requirements.txt \
+    \
+    && find /usr/local/lib/python3.7/ -type d -name tests -depth -exec rm -rf {} \; \
+    && find /usr/local/lib/python3.7/ -type d -name test -depth -exec rm -rf {} \; \
+    && find /usr/local/lib/python3.7/ -name __pycache__ -depth -exec rm -rf {} \; \
+    && find /usr/local/lib/python3.7/ -name "*.pyc" -depth -exec rm -f {} \; \
+    \
+    && apt-get purge -y --auto-remove \
+        dirmngr \
+        gpg-agent \
+        gpg \
+        git \
+        libffi-dev \
+        libxml2-dev \
+        libxslt1-dev \
+        zlib1g-dev \
+        build-essential \
+        gcc \
+        python-dev \
+        dpkg-dev \
+        gcc-7 \
+        luarocks \
     && rm -fr \
-        /etc/nginx \
         /var/{cache,log}/* \
         /var/lib/apt/lists/* \
         /root/.cache \
-    \
+    && find /tmp/ -mindepth 1  -delete
-    && mkdir -p /var/log/nginx \
+
-    && touch /var/log/nginx/error.log
+# Move access.log to stdout and error.log to stderr
+RUN mkdir -p /var/log/nginx && ln -sf /dev/stdout /var/log/nginx/access.log && ln -sf /dev/stderr /var/log/nginx/error.log
 
 # Copy root filesystem
 COPY rootfs /

mopidy/build.json

@@ -1,8 +1,8 @@
 {
     "build_from": {
-        "amd64": "hassioaddons/ubuntu-base-amd64:3.1.2",
+        "amd64": "hassioaddons/debian-base-amd64:3.0.0",
-        "armv7": "hassioaddons/ubuntu-base-armv7:3.1.2",
+        "armv7": "hassioaddons/debian-base-armv7:3.0.0",
-        "i386": "hassioaddons/ubuntu-base-i386:3.1.2"
+        "i386": "hassioaddons/debian-base-i386:3.0.0"
     },
     "args": {}
 }

mopidy/requirements.txt

@@ -1,3 +1,9 @@
-Mopidy-GMusic==3.0.0
+Mopidy==3.0.1
-Mopidy-Iris==3.39.0
+Pykka==2.0.2
-Mopidy-SoundCloud==2.1.0
+Mopidy-Local==3.1.1
+Mopidy-AlsaMixer==2.0.0
+Mopidy-Spotify==4.0.1
+Mopidy-Iris==3.44.0
+Mopidy-SoundCloud==3.0.0
+Mopidy-GMusic==4.0.0
+Mopidy-Youtube==3.0a1