This commit is contained in:
Brandon
2019-08-19 14:58:43 -05:00
parent f0b034529d
commit 2f4690b638
2 changed files with 12 additions and 11 deletions

View File

@@ -1,9 +1,6 @@
FROM jfloff/alpine-python:2.7 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" ENV PYTHONPATH="/usr/local/lib/python2.7/site-packages:/usr/lib/python2.7/site-packages"
WORKDIR /mopidy WORKDIR /mopidy
@@ -16,16 +13,18 @@ RUN \
&& apk upgrade --no-cache \ && apk upgrade --no-cache \
&& pip install --upgrade pip \ && pip install --upgrade pip \
&& echo "* Installing Runtime Packages" \ && echo "* Installing Runtime Packages" \
&& apk add --no-cache \ && apk add -U --no-cache \
libcdio \ libcdio \
libcaca \ libcaca \
libvpx@edge \ libvpx@edge \
libffi-dev \ libffi-dev \
openssl-dev \ openssl-dev \
v4l-utils-libs@edge \ v4l-utils-libs@edge \
python2-dev@edge \
py2-gst@edge \ py2-gst@edge \
py-gobject@edge \ py-gobject@edge \
su-exec \ su-exec@edge \
gstreamer@edge \
gst-plugins-good@edge \ gst-plugins-good@edge \
gst-plugins-ugly@edge \ gst-plugins-ugly@edge \
&& pip install -U \ && pip install -U \
@@ -40,12 +39,12 @@ RUN \
&& 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 \
&& echo "* Fixing privileges" \ && echo "* Fixing privileges" \
&& mkdir -p /data \ && mkdir -p /data/.config /data/.cache \
&& chown -R mopidy:mopidy /data \ && chown -R mopidy:mopidy /data \
&& echo "* Cleaning up" \ && echo "* Cleaning up" \
&& rm -f /var/cache/apk/* \ && rm -f /var/cache/apk/* \
&& echo "* Ready to start Mopidy" \ && echo "* Ready to start Mopidy" \
&& sleep 10 && sleep 1
COPY root/ / COPY root/ /
RUN chmod +x /usr/local/bin/run.sh RUN chmod +x /usr/local/bin/run.sh

View File

@@ -1,7 +1,9 @@
#!/bin/sh #!/bin/sh
if [ ! -f /data/.config/mopidy.conf ]; then if [ ! -f /data/.config/mopidy.conf ]; then
mkdir -p /data/.config mkdir -p /data/.config && cp /defaults/mopidy.conf /data/.config
cp /defaults/mopidy.conf /data/.config/mopidy.conf
fi 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