diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bf53e9..395ecf1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## 2020-09-10 +- added support for deezloader ui by environment variable "DEEZUI" + +## 2020-09-08 +- Switched the installer to the new server-requirements + +## 2020-09-05 +- Fixed the ARL updater + ## 2020-07-24 - Updated code to pull from codeberg instead of notabug diff --git a/README.md b/README.md index e5b2bc5..4d9084f 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ $ docker run -d --name Deemix \ -e PGID=1000 \ -e ARL=1234567 \ -e UMASK_SET=022 \ + -e DEEZUI=false \ -p 6595:6595 \ registry.gitlab.com/bockiii/deemix-docker ``` @@ -45,6 +46,7 @@ services: - PGID=1000 - ARL=1234567 - UMASK_SET=022 + - DEEZUI=false ports: - 6595:6595 ``` @@ -67,6 +69,8 @@ The container will look for a new update in the Deemix repo on every start and w `-e UMASK_SET=022 - OPTIONAL: Setting UMASK for file permissions Default is 022 +`-e DEEZUI=false - OPTIONAL: Setting DEEZUI to true will change your GUI to the legacy Deezloader UI. + `-p 6595:6595` - Port opened for the web interface. `registry.gitlab.com/bockiii/deemix-docker` - This container. diff --git a/docker-compose.yml b/docker-compose.yml index 5666ce2..8fcec30 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,5 +11,6 @@ services: - PGID=1000 - ARL=1234567 - UMASK_SET=022 + - DEEZUI=false ports: - 6595:6595 \ No newline at end of file diff --git a/root/etc/cont-init.d/20-download b/root/etc/cont-init.d/20-download index c2df321..c7a8a7a 100644 --- a/root/etc/cont-init.d/20-download +++ b/root/etc/cont-init.d/20-download @@ -6,8 +6,16 @@ echo "[cont-init.d] Downloading and unpacking" if [ ! -f "/deemix/server.py" ]; then echo "[cont-init.d] First start, cloning repo" - git clone --recurse-submodules https://codeberg.org/RemixDev/deemix-pyweb.git deemix - touch /deemix/updated + if [[ "${DEEZUI}" == "true" ]]; then + echo "[cont-init.d] Using Deezloader UI" + git clone https://codeberg.org/RemixDev/deemix-pyweb.git /deemix + git clone https://codeberg.org/RemixDev/deezloader-deemix.git /deemix/webui + touch /deemix/updated + else + echo "[cont-init.d] Using Deemix UI" + git clone --recurse-submodules https://codeberg.org/RemixDev/deemix-pyweb.git /deemix + touch /deemix/updated + fi else cd /deemix localv=$(git rev-parse HEAD) @@ -16,7 +24,16 @@ else echo -e "[cont-init.d] Latest Version. No update needed" else echo -e "[cont-init.d] Newer Version. Updating" - git pull --recurse-submodules - touch /deemix/updated + if [[ "${DEEZUI}" == "true" ]]; then + echo "[cont-init.d] Using Deezloader UI" + git pull + cd /deemix/webui + git pull + touch /deemix/updated + else + echo "[cont-init.d] Using Deemix UI" + git pull --recurse-submodules + touch /deemix/updated + fi fi -fi \ No newline at end of file +fi