Merge remote-tracking branch 'origin/master'

install/docker/Dockerfile

@@ -3,7 +3,7 @@ FROM alpine:3.6
 LABEL description="Airsonic is a free, web-based media streamer, providing ubiquitious access to your music." \
       url="https://github.com/airsonic/airsonic"
 
-ENV AIRSONIC_PORT=4040 AIRSONIC_DIR=/airsonic
+ENV AIRSONIC_PORT=4040 AIRSONIC_DIR=/airsonic CONTEXT_PATH=/
 
 WORKDIR $AIRSONIC_DIR
 

install/docker/run.sh

@@ -15,7 +15,7 @@ if [[ $# -lt 1 ]] || [[ ! "$1" == "java"* ]]; then
     exec java -Xmx256m \
      -Dserver.host=0.0.0.0 \
      -Dserver.port=$AIRSONIC_PORT \
-     -Dserver.contextPath=/ \
+     -Dserver.contextPath=$CONTEXT_PATH \
      -Dairsonic.home=$AIRSONIC_DIR/data \
      -Dairsonic.defaultMusicFolder=$AIRSONIC_DIR/music \
      -Dairsonic.defaultPodcastFolder=$AIRSONIC_DIR/podcasts \