Skip to content

Env var improvements #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
2-shell wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Env var improvements #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3372cec
Fix shellcheck warning SC2027 about mis-quoted var
Jan 8, 2023
e67862d
Move env var definitions to Dockerfile
Jan 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
FROM ubuntu:latest
LABEL version="1.1" maintainer="John Stucklen <stuckj@gmail.com>"
LABEL version="1.2" maintainer="John Stucklen <stuckj@gmail.com>"

ENV LC_ALL en_US.UTF-8
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV SUBSONIC_HOME /var/subsonic
ENV SUBSONIC_HOST 0.0.0.0
ENV SUBSONIC_PORT 4040
ENV SUBSONIC_HTTPS_PORT 0
ENV SUBSONIC_CONTEXT_PATH /
ENV SUBSONIC_DB ""
ENV SUBSONIC_MAX_MEMORY 150
ENV SUBSONIC_DEFAULT_MUSIC_FOLDER /var/music
ENV SUBSONIC_DEFAULT_PODCAST_FOLDER /var/music/Podcast
ENV SUBSONIC_DEFAULT_PLAYLIST_FOLDER /var/playlists
ENV SUBSONIC_UID 1000
ENV SUBSONIC_GID 1000

Expand All @@ -29,8 +39,8 @@ COPY entrypoint.sh /opt/subsonic/entrypoint.sh

WORKDIR /opt/subsonic

VOLUME [ "/var/music", "/var/playlists", "/var/subsonic" ]
VOLUME $SUBSONIC_DEFAULT_MUSIC_FOLDER $SUBSONIC_DEFAULT_PLAYLIST_FOLDER $SUBSONIC_HOME

EXPOSE 4040/tcp
EXPOSE $SUBSONIC_PORT/tcp

ENTRYPOINT [ "/opt/subsonic/entrypoint.sh" ]
15 changes: 1 addition & 14 deletions entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,6 @@ set -e
# This is a replacement for subsonic.sh that comes with subsonic as it is not docker friendly
# This will properly NOT daemonize the java process and will log to stdout / stderr.

# Note: default to environment variables, if set.

SUBSONIC_HOME=${SUBSONIC_HOME:-/var/subsonic}
SUBSONIC_HOST=${SUBSONIC_HOST:-0.0.0.0}
SUBSONIC_PORT=${SUBSONIC_PORT:-4040}
SUBSONIC_HTTPS_PORT=${SUBSONIC_HTTPS_PORT:-0}
SUBSONIC_CONTEXT_PATH=${SUBSONIC_CONTEXT_PATH:-/}
SUBSONIC_DB=${SUBSONIC_DB}
SUBSONIC_MAX_MEMORY=${SUBSONIC_MAX_MEMORY:-150}
SUBSONIC_DEFAULT_MUSIC_FOLDER=${SUBSONIC_DEFAULT_MUSIC_FOLDER:-/var/music}
SUBSONIC_DEFAULT_PODCAST_FOLDER=${SUBSONIC_DEFAULT_PODCAST_FOLDER:-/var/music/Podcast}
SUBSONIC_DEFAULT_PLAYLIST_FOLDER=${SUBSONIC_DEFAULT_PLAYLIST_FOLDER:-/var/playlists}

# Create subsonic user, taking uid, gid and homedir from (Docker) environment
if ! id -g subsonic > /dev/null 2>&1; then
groupadd --system -o --gid "$SUBSONIC_GID" subsonic
Expand Down Expand Up @@ -50,7 +37,7 @@ exec /bin/su -s /bin/bash -c "${JAVA} -Xmx${SUBSONIC_MAX_MEMORY}m \
-Dsubsonic.port=${SUBSONIC_PORT} \
-Dsubsonic.httpsPort=${SUBSONIC_HTTPS_PORT} \
-Dsubsonic.contextPath=${SUBSONIC_CONTEXT_PATH} \
-Dsubsonic.db="${SUBSONIC_DB}" \
-Dsubsonic.db=\"${SUBSONIC_DB}\" \
-Dsubsonic.defaultMusicFolder=${SUBSONIC_DEFAULT_MUSIC_FOLDER} \
-Dsubsonic.defaultPodcastFolder=${SUBSONIC_DEFAULT_PODCAST_FOLDER} \
-Dsubsonic.defaultPlaylistFolder=${SUBSONIC_DEFAULT_PLAYLIST_FOLDER} \
Expand Down