From cca6114142172cf43a118a6aac3c232aafdad93f Mon Sep 17 00:00:00 2001 From: casjay Date: Fri, 30 Sep 2022 17:56:19 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 16 +++++++-------- README.md | 35 ++++++++++++++++++--------------- bin/entrypoint-music.sh | 8 ++++---- config/mpd/mpd.conf | 2 +- config/navidrome/navidrome.toml | 5 ++--- 5 files changed, 34 insertions(+), 32 deletions(-) diff --git a/Dockerfile b/Dockerfile index a791f17..bb41e4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM casjaysdevdocker/alpine:latest as build ARG alpine_version=edge ARG LICENSE=WTFPL \ - IMAGE_NAME=music \ + IMAGE_NAME=navidrome \ TIMEZONE=America/New_York \ PORT=80 @@ -28,10 +28,10 @@ COPY ./data/. /data/ FROM scratch ARG BUILD_DATE="$(date +'%Y-%m-%d %H:%M')" -LABEL org.label-schema.name="music" \ - org.label-schema.description="Containerized version of music" \ - org.label-schema.url="https://hub.docker.com/r/casjaysdevdocker/music" \ - org.label-schema.vcs-url="https://github.com/casjaysdevdocker/music" \ +LABEL org.label-schema.name="navidrome" \ + org.label-schema.description="Containerized version of navidrome" \ + org.label-schema.url="https://hub.docker.com/r/casjaysdevdocker/navidrome" \ + org.label-schema.vcs-url="https://github.com/casjaysdevdocker/navidrome" \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.version=$BUILD_DATE \ org.label-schema.vcs-ref=$BUILD_DATE \ @@ -43,7 +43,7 @@ LABEL org.label-schema.name="music" \ ENV SHELL="/bin/bash" \ TERM="xterm-256color" \ - HOSTNAME="casjaysdev-music" \ + HOSTNAME="casjaysdev-navidrome" \ TZ="${TZ:-America/New_York}" WORKDIR /root @@ -55,5 +55,5 @@ EXPOSE $PORT COPY --from=build /. / ENTRYPOINT [ "tini", "--" ] -HEALTHCHECK CMD [ "/usr/local/bin/entrypoint-music.sh", "healthcheck" ] -CMD [ "/usr/local/bin/entrypoint-music.sh" ] +HEALTHCHECK CMD [ "/usr/local/bin/entrypoint-navidrome.sh", "healthcheck" ] +CMD [ "/usr/local/bin/entrypoint-navidrome.sh" ] diff --git a/README.md b/README.md index 09378cb..0aa44c9 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,29 @@ -## 👋 Welcome to music 🚀 +## 👋 Welcome to navidrome 🚀 - play music +navidrome ## Run container ```shell -dockermgr update music +dockermgr update navidrome ``` ### via command line ```shell -docker pull casjaysdevdocker/music:latest && \ +docker pull casjaysdevdocker/navidrome:latest && \ docker run -d \ --restart always \ ---name casjaysdevdocker-music \ ---hostname casjaysdev-music \ +--name casjaysdevdocker-navidrome \ +--hostname casjaysdev-navidrome \ -e TZ=${TIMEZONE:-America/New_York} \ --v $HOME/.local/share/docker/storage/music/data:/data \ --v $HOME/.local/share/docker/storage/music/config:/config \ +-v $HOME/Music:/data/music \ +-v $HOME/.local/share/docker/storage/navidrome/data:/data:z \ +-v $HOME/.local/share/docker/storage/navidrome/config:/config:z \ -p 19020:80 \ -p 6600:6600 \ -casjaysdevdocker/music:latest +casjaysdevdocker/navidrome:latest ``` ### via docker-compose @@ -30,17 +31,19 @@ casjaysdevdocker/music:latest ```yaml version: "2" services: - music: - image: casjaysdevdocker/music - container_name: music + navidrome: + image: casjaysdevdocker/navidrome + container_name: navidrome environment: - TZ=America/New_York - - HOSTNAME=casjaysdev-music + - HOSTNAME=casjaysdev-navidrome volumes: - - $HOME/.local/share/docker/storage/music/data:/data:z - - $HOME/.local/share/docker/storage/music/config:/config:z + - $HOME/Music:/data/music:z + - $HOME/.local/share/docker/storage/navidrome/data:/data:z + - $HOME/.local/share/docker/storage/navidrome/config:/config:z ports: - - 80:80 + - 19020:80 + - 6600:6600 restart: always ``` diff --git a/bin/entrypoint-music.sh b/bin/entrypoint-music.sh index 5b4fbed..803f8f8 100755 --- a/bin/entrypoint-music.sh +++ b/bin/entrypoint-music.sh @@ -5,10 +5,10 @@ # @@Author : Jason Hempstead # @@Contact : jason@casjaysdev.com # @@License : WTFPL -# @@ReadME : entrypoint-music.sh --help +# @@ReadME : entrypoint-navidrome.sh --help # @@Copyright : Copyright: (c) 2022 Jason Hempstead, Casjays Developments # @@Created : Tuesday, Sep 06, 2022 21:32 EDT -# @@File : entrypoint-music.sh +# @@File : entrypoint-navidrome.sh # @@Description : # @@Changelog : New script # @@TODO : Better documentation @@ -123,10 +123,10 @@ if ! pgrep mpd &>/dev/null; then fi # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if [ ! -f "/data/playlists/all.m3u" ]; then - find "/data/music/" -iname '*.mp3' -type f >"/data/playlists/all.m3u" + find "/data/navidrome/" -iname '*.mp3' -type f >"/data/playlists/all.m3u" fi # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -chmod 777 -Rf "/data/mpd" "/data/navidrome" "/data/music" "/data/playlists" "/config/mpd" +chmod 777 -Rf "/data/mpd" "/data/navidrome" "/data/navidrome" "/data/playlists" "/config/mpd" chown -Rf mpd "/config/mpd" "/data/mpd" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - case "$1" in diff --git a/config/mpd/mpd.conf b/config/mpd/mpd.conf index 394e5f4..f869741 100644 --- a/config/mpd/mpd.conf +++ b/config/mpd/mpd.conf @@ -24,7 +24,7 @@ filesystem_charset "UTF-8" # Output ####################################################################### audio_output { type "null" - name "This server does not need to play music, but it can" + name "This server does not need to play navidrome, but it can" } audio_output { type "httpd" diff --git a/config/navidrome/navidrome.toml b/config/navidrome/navidrome.toml index cf8e2f3..5d6efd5 100644 --- a/config/navidrome/navidrome.toml +++ b/config/navidrome/navidrome.toml @@ -9,8 +9,8 @@ EnableTranscodingConfig = true TranscodingCacheSize = "500MB" ImageCacheSize = "100MB" AutoImportPlaylists = true -UILoginBackgroundUrl = "https://source.unsplash.com/random/1600x900?music" -UIWelcomeMessage = "Welcome to CasjaysDev music server" +UILoginBackgroundUrl = "https://source.unsplash.com/random/1600x900?navidrome" +UIWelcomeMessage = "Welcome to CasjaysDev navidrome server" EnableCoverAnimation = true RecentlyAddedByModTime = false CoverArtPriority = "embedded, cover.*, folder.*, front.*" @@ -39,4 +39,3 @@ Extractor = "taglib" # [ListenBrainz] Enabled = true -