From f0b034529df2925b7fb314d88ac955eab16f9747 Mon Sep 17 00:00:00 2001 From: Brandon Date: Mon, 19 Aug 2019 13:04:01 -0500 Subject: [PATCH] Bump --- Dockerfile | 2 +- root/usr/local/bin/run.sh | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 285f2ee..6a89254 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ RUN \ && addgroup -g ${PGID} mopidy \ && adduser -h /mopidy -s /bin/sh -D -G mopidy -u ${PUID} mopidy \ && echo "* Fixing privileges" \ - && mkdir -p /data/.config /data/.cache \ + && mkdir -p /data \ && chown -R mopidy:mopidy /data \ && echo "* Cleaning up" \ && rm -f /var/cache/apk/* \ diff --git a/root/usr/local/bin/run.sh b/root/usr/local/bin/run.sh index 499dece..3167a39 100755 --- a/root/usr/local/bin/run.sh +++ b/root/usr/local/bin/run.sh @@ -1,12 +1,7 @@ #!/bin/sh +if [ ! -f /data/.config/mopidy.conf ]; then + mkdir -p /data/.config + cp /defaults/mopidy.conf /data/.config/mopidy.conf +fi -[[ ! -f /data/.config/mopidy.conf ]] && cp /defaults/mopidy.conf /data/.config/mopidy.conf - -function stop() { - kill $PID -} - -trap stop HUP INT TERM su-exec mopidy mopidy --config "/data/.config/mopidy.conf" "${@}" & -PID=$! -wait $PID