Move all config to /config

Author: thespad

Dockerfile

@@ -37,16 +37,16 @@ RUN \
   rm -rf /app/nzbget/bin/ && \
   rm -rf /app/nzbget/etc/ && \
   sed -i \
-    -e "s|^MainDir=.*|MainDir=/downloads|g" \
+    -e "s|^MainDir=.*|MainDir=/config|g" \
     -e "s|^ScriptDir=.*|ScriptDir=$\{MainDir\}/scripts|g" \
     -e "s|^WebDir=.*|WebDir=$\{AppDir\}/webui|g" \
     -e "s|^ConfigTemplate=.*|ConfigTemplate=$\{AppDir\}/webui/nzbget.conf.template|g" \
     -e "s|^UnrarCmd=.*|UnrarCmd=unrar|g" \
     -e "s|^SevenZipCmd=.*|SevenZipCmd=7z|g" \
     -e "s|^CertStore=.*|CertStore=$\{AppDir\}/cacert.pem|g" \
     -e "s|^CertCheck=.*|CertCheck=yes|g" \
-    -e "s|^DestDir=.*|DestDir=$\{MainDir\}/completed|g" \
-    -e "s|^InterDir=.*|InterDir=$\{MainDir\}/intermediate|g" \
+    -e "s|^DestDir=.*|DestDir=/downloads/completed|g" \
+    -e "s|^InterDir=.*|InterDir=/downloads/intermediate|g" \
     -e "s|^LogFile=.*|LogFile=$\{MainDir\}/nzbget.log|g" \
     -e "s|^AuthorizedIP=.*|AuthorizedIP=127.0.0.1|g" \
   /app/nzbget/share/nzbget/nzbget.conf && \

Dockerfile.aarch64

@@ -37,16 +37,16 @@ RUN \
   rm -rf /app/nzbget/bin/ && \
   rm -rf /app/nzbget/etc/ && \
   sed -i \
-    -e "s|^MainDir=.*|MainDir=/downloads|g" \
+    -e "s|^MainDir=.*|MainDir=/config|g" \
     -e "s|^ScriptDir=.*|ScriptDir=$\{MainDir\}/scripts|g" \
     -e "s|^WebDir=.*|WebDir=$\{AppDir\}/webui|g" \
     -e "s|^ConfigTemplate=.*|ConfigTemplate=$\{AppDir\}/webui/nzbget.conf.template|g" \
     -e "s|^UnrarCmd=.*|UnrarCmd=unrar|g" \
     -e "s|^SevenZipCmd=.*|SevenZipCmd=7z|g" \
     -e "s|^CertStore=.*|CertStore=$\{AppDir\}/cacert.pem|g" \
     -e "s|^CertCheck=.*|CertCheck=yes|g" \
-    -e "s|^DestDir=.*|DestDir=$\{MainDir\}/completed|g" \
-    -e "s|^InterDir=.*|InterDir=$\{MainDir\}/intermediate|g" \
+    -e "s|^DestDir=.*|DestDir=/downloads/completed|g" \
+    -e "s|^InterDir=.*|InterDir=/downloads/intermediate|g" \
     -e "s|^LogFile=.*|LogFile=$\{MainDir\}/nzbget.log|g" \
     -e "s|^AuthorizedIP=.*|AuthorizedIP=127.0.0.1|g" \
   /app/nzbget/share/nzbget/nzbget.conf && \

README.md

@@ -315,6 +315,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
-* **27.05.24:** - Rebase to Alpine 3.21.
+* **27.05.24:** - Rebase to Alpine 3.21. Move MainDir to /config, leave default DestDir/InterDir as /downloads.
 * **27.05.24:** - Rebase to Alpine 3.20.
 * **09.05.24:** - Revive image based on the fork from https://github.com/nzbgetcom/nzbget

readme-vars.yml

@@ -97,6 +97,6 @@ init_diagram: |
   "nzbget:testing" <- Base Images
 # changelog
 changelogs:
-  - {date: "27.05.24:", desc: "Rebase to Alpine 3.21."}
+  - {date: "27.05.24:", desc: "Rebase to Alpine 3.21. Move MainDir to /config, leave default DestDir/InterDir as /downloads."}
   - {date: "27.05.24:", desc: "Rebase to Alpine 3.20."}
   - {date: "09.05.24:", desc: "Revive image based on the fork from https://github.com/nzbgetcom/nzbget"}

root/etc/s6-overlay/s6-rc.d/init-nzbget-config/run

@@ -6,23 +6,16 @@ if [[ ! -f /config/nzbget.conf ]]; then
     cp /app/nzbget/share/nzbget/nzbget.conf /config/nzbget.conf
 fi
 
-# Warn if /downloads is the MainDir and isn't mounted
-if ! grep -qe ' /downloads ' /proc/mounts && grep -qe 'MainDir=/downloads' /config/nzbget.conf; then
-    echo "********************************************* WARNING *********************************************"
-    echo "  Your MainDir is set to /downloads in /config/nzbget.conf but /downloads is not a mounted folder  "
-    echo "                    This may result in data loss when your container is updated                    "
-    echo "***************************************************************************************************"
-    mkdir -p /downloads
-fi
-
 # delete lock file if found
-if [[ -f /downloads/nzbget.lock ]]; then
-    rm /downloads/nzbget.lock
+if [[ -f /config/nzbget.lock ]]; then
+    rm /config/nzbget.lock
 fi
 
 if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
-    lsiown abc:abc \
-        /downloads
+    if grep -qe ' /downloads ' /proc/mounts; then
+        lsiown abc:abc \
+            /downloads
+    fi
 
     lsiown -R abc:abc \
         /config