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 · 7fa9e49 · 7fa9e49
1 parent cb39b1e
commit 7fa9e49
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 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.md b/README.md
@@ -81,8 +81,7 @@ services:
       - TZ=Etc/UTC
     volumes:
       - /path/to/appdata/config:/config
-      - /path/to/data1:/data1
-      - /path/to/data2:/data2
+      - /path/to/data1:/data
     ports:
       - 8384:8384
       - 22000:22000/tcp
@@ -105,8 +104,7 @@ docker run -d \
   -p 22000:22000/udp \
   -p 21027:21027/udp \
   -v /path/to/appdata/config:/config \
-  -v /path/to/data1:/data1 \
-  -v /path/to/data2:/data2 \
+  -v /path/to/data1:/data \
   --restart unless-stopped \
   lscr.io/linuxserver/syncthing:latest
 ```
@@ -126,8 +124,7 @@ Containers are configured using parameters passed at runtime (such as those abov
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
 | `-v /config` | Configuration files. |
-| `-v /data1` | Data1 |
-| `-v /data2` | Data2 |
+| `-v /data` | Data root directory |
 
 ## Environment variables from files (Docker secrets)
 
@@ -305,6 +302,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **10.12.23:** - add a dedicated data directory volume
 * **05.09.23:** - Rebase to Alpine 3.18.
 * **01.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
 * **13.02.23:** - 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