From d70b0c8de7d07b42aad36a7bc576b67e2f319469 Mon Sep 17 00:00:00 2001
From: Wonderfall <wonderfall@schrodinger.io>
Date: Sat, 17 Sep 2016 01:43:22 +0200
Subject: [PATCH] subsonic: better init

---
 subsonic/Dockerfile | 13 +++++++++----
 subsonic/run.sh     |  8 ++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/subsonic/Dockerfile b/subsonic/Dockerfile
index 75f8250..7d9badc 100644
--- a/subsonic/Dockerfile
+++ b/subsonic/Dockerfile
@@ -2,24 +2,29 @@ FROM alpine:3.4
 MAINTAINER Wonderfall <wonderfall@schrodinger.io>
 
 ARG VERSION=6.0
+
 ENV GID=991 UID=991
+
 WORKDIR /subsonic
 
-RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
+RUN echo "@community https://nl.alpinelinux.org/alpine/v3.4/community" >> /etc/apk/repositories \
  && apk -U add \
     ffmpeg \
-    openjdk8-jre@commuedge \
-    tini@commuedge \
+    su-exec \
+    openjdk8-jre@community \
+    tini@community \
  && wget -qO- http://subsonic.org/download/subsonic-${VERSION}-standalone.tar.gz | tar zxf - \
  && rm -f /var/cache/apk/*
 
 COPY run.sh /usr/local/bin/run.sh
+
 RUN chmod +x /usr/local/bin/run.sh
 
 EXPOSE 4040
+
 VOLUME /data /musics /playlists /podcasts
 
 LABEL description "Open source media streamer" \
       subsonic "Subsonic v$VERSION"
 
-CMD ["/sbin/tini","--","run.sh"]
+CMD ["run.sh"]
diff --git a/subsonic/run.sh b/subsonic/run.sh
index 1b18ebc..0a0d645 100644
--- a/subsonic/run.sh
+++ b/subsonic/run.sh
@@ -1,15 +1,12 @@
 #!/bin/sh
-addgroup -g ${GID} subsonic && adduser -h /subsonic -s /bin/sh -D -G subsonic -u ${UID} subsonic
 
 mkdir -p /data/transcode
 ln -s /usr/bin/ffmpeg /data/transcode/ffmpeg
 ln -s /usr/bin/lame /data/transcode/lame
 
-chown -R subsonic:subsonic /data /playlists /subsonic
+chown -R $UID:$GID /data /playlists /subsonic
 
-sleep 7 # avoid 503
-
-exec su subsonic << EOF
+exec su-exec $UID:$GID tini -- \
 java -Xmx200m \
   -Dsubsonic.home=/data \
   -Dsubsonic.host=0.0.0.0 \
@@ -21,4 +18,3 @@ java -Xmx200m \
   -Dsubsonic.defaultPlaylistFolder=/playlists \
   -Djava.awt.headless=true \
   -jar subsonic-booter-jar-with-dependencies.jar
-EOF