From 2f4690b638a27ac50695808e8675c67e06dae38e Mon Sep 17 00:00:00 2001
From: Brandon <brandon@tendency.me>
Date: Mon, 19 Aug 2019 14:58:43 -0500
Subject: [PATCH] Bump

---
 Dockerfile                | 15 +++++++--------
 root/usr/local/bin/run.sh |  8 +++++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6a89254..b9b5015 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,6 @@
 FROM jfloff/alpine-python:2.7
-MAINTAINER Log1x <github@log1x.com>
-
-ENV PUID="${PUID:-1000}"
-ENV PGID="${PGID:-1000}"
 
+ENV PUID="${PUID:-1000}" PGID="${PGID:-1000}"
 ENV PYTHONPATH="/usr/local/lib/python2.7/site-packages:/usr/lib/python2.7/site-packages"
 
 WORKDIR /mopidy
@@ -16,16 +13,18 @@ RUN \
     && apk upgrade --no-cache \
     && pip install --upgrade pip \
   && echo "* Installing Runtime Packages" \
-    && apk add --no-cache \
+    && apk add -U --no-cache \
       libcdio \
       libcaca \
       libvpx@edge \
       libffi-dev \
       openssl-dev \
       v4l-utils-libs@edge \
+      python2-dev@edge \
       py2-gst@edge \
       py-gobject@edge \
-      su-exec \
+      su-exec@edge \
+      gstreamer@edge \
       gst-plugins-good@edge \
       gst-plugins-ugly@edge \
     && pip install -U \
@@ -40,12 +39,12 @@ RUN \
     && addgroup -g ${PGID} mopidy \
     && adduser -h /mopidy -s /bin/sh -D -G mopidy -u ${PUID} mopidy \
   && echo "* Fixing privileges" \
-    && mkdir -p /data \
+    && mkdir -p /data/.config /data/.cache \
     && chown -R mopidy:mopidy /data \
   && echo "* Cleaning up" \
     && rm -f /var/cache/apk/* \
   && echo "* Ready to start Mopidy" \
-  && sleep 10
+  && sleep 1
 
 COPY   root/ /
 RUN    chmod +x /usr/local/bin/run.sh
diff --git a/root/usr/local/bin/run.sh b/root/usr/local/bin/run.sh
index 3167a39..b3de7ea 100755
--- a/root/usr/local/bin/run.sh
+++ b/root/usr/local/bin/run.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 if [ ! -f /data/.config/mopidy.conf ]; then
-  mkdir -p /data/.config
-  cp /defaults/mopidy.conf /data/.config/mopidy.conf
+  mkdir -p /data/.config && cp /defaults/mopidy.conf /data/.config
 fi
 
-su-exec mopidy mopidy --config "/data/.config/mopidy.conf" "${@}" &
+trap "kill $PID" HUP INT TERM
+su-exec mopidy mopidy --config /data/.config/mopidy.conf "${@}" &
+PID=$!
+wait $PID
\ No newline at end of file