Separate data and config directory

Add a new directory /data to put the shares in and config where the config stays. Do not create default share by default Fixes linuxserver#67
bmillemathias · Dec 10, 2023 · e47dd5c · e47dd5c
1 parent cb39b1e
commit e47dd5c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -43,7 +43,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thelamer"
 
 # environment settings
-ENV HOME="/config"
+ENV HOME="/data"
 
 RUN \
   echo "**** create var lib folder ****" && \
@@ -57,3 +57,4 @@ COPY root/ /
 # ports and volumes
 EXPOSE 8384 22000/tcp 22000/udp 21027/UDP
 VOLUME /config
+VOLUME /data
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -43,7 +43,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thelamer"
 
 # environment settings
-ENV HOME="/config"
+ENV HOME="/data"
 
 RUN \
   echo "**** create var lib folder ****" && \
@@ -57,3 +57,4 @@ COPY root/ /
 # ports and volumes
 EXPOSE 8384 22000/tcp 22000/udp 21027/UDP
 VOLUME /config
+VOLUME /data
diff --git a/readme-vars.yml b/readme-vars.yml
@@ -22,8 +22,7 @@ param_env_vars:
 param_usage_include_vols: true
 param_volumes:
   - {vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Configuration files."}
-  - {vol_path: "/data1", vol_host_path: "/path/to/data1", desc: "Data1"}
-  - {vol_path: "/data2", vol_host_path: "/path/to/data2", desc: "Data2"}
+  - {vol_path: "/data", vol_host_path: "/path/to/data", desc: "Dedicated data directory"}
 param_usage_include_ports: true
 param_ports:
   - {external_port: "8384", internal_port: "8384", port_desc: "Application WebUI"}
@@ -35,6 +34,7 @@ app_setup_block_enabled: true
 app_setup_block: "**Note: ** The Syncthing devs highly suggest setting a password for this container as it listens on 0.0.0.0. To do this go to `Actions -> Settings -> set user/password` for the webUI."
 # changelog
 changelogs:
+  - {date: "10.12.23:", desc: "Add a dedicated data directory volume"}
   - {date: "05.09.23:", desc: "Rebase to Alpine 3.18."}
   - {date: "01.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
   - {date: "13.02.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3."}

diff --git a/root/etc/s6-overlay/s6-rc.d/svc-syncthing/run b/root/etc/s6-overlay/s6-rc.d/svc-syncthing/run
@@ -3,6 +3,6 @@
 
 exec \
     s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8384" \
-        s6-setuidgid abc syncthing \
-        -home=/config -no-browser -no-restart \
-        --gui-address="0.0.0.0:8384"
+        s6-setuidgid abc syncthing --config=/config --data=/data \
+	--no-browser --no-restart --gui-address="0.0.0.0:8384" \
+        --no-default-folder