Merge pull request #43 from linuxserver/jammy

.github/workflows/call_invalid_helper.yml

@@ -0,0 +1,12 @@
+name: Comment on invalid interaction
+on:
+  issues:
+    types:
+      - labeled
+jobs:
+  add-comment-on-invalid:
+    if: github.event.label.name == 'invalid'
+    permissions:
+      issues: write
+    uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1
+    secrets: inherit

Dockerfile

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
 
 # set version label
 ARG BUILD_DATE
@@ -23,7 +25,10 @@ RUN \
     "resilio-sync=${SYNC_VERSION}" && \
   echo "**** cleanup ****" && \
   rm -rf \
-    /tmp/*
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/* \
+    /var/log/*
 
 # add local files
 COPY root/ /

Dockerfile.aarch64

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
 
 # set version label
 ARG BUILD_DATE
@@ -23,7 +25,10 @@ RUN \
     "resilio-sync=${SYNC_VERSION}" && \
   echo "**** cleanup ****" && \
   rm -rf \
-    /tmp/*
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/* \
+    /var/log/*
 
 # add local files
 COPY root/ /

Dockerfile.armhf

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy
 
 # set version label
 ARG BUILD_DATE
@@ -23,7 +25,10 @@ RUN \
     "resilio-sync=${SYNC_VERSION}" && \
   echo "**** cleanup ****" && \
   rm -rf \
-    /tmp/*
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/* \
+    /var/log/*
 
 # add local files
 COPY root/ /

README.md

@@ -231,6 +231,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **14.12.22:** - Rebase to Jammy, migrate to s6v3.
 * **03.10.21:** - Use upstream apt repo to install. Rebase to focal.
 * **20.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.

readme-vars.yml

@@ -46,6 +46,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "14.12.22:", desc: "Rebase to Jammy, migrate to s6v3." }
   - { date: "03.10.21:", desc: "Use upstream apt repo to install. Rebase to focal." }
   - { date: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
   - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }

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

@@ -1,11 +1,13 @@
 #!/usr/bin/with-contenv bash
 
 # copy config
-[[ ! -e /config/sync.conf ]] && \
+if [[ ! -e /config/sync.conf ]]; then
     cp /defaults/sync.conf /config/sync.conf
+fi
 
 # permissions
-chown -R abc:abc \
+lsiown -R abc:abc \
     /config
-chown abc:abc \
+
+lsiown abc:abc \
     /sync

root/etc/s6-overlay/s6-rc.d/init-resilio-sync-config/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-resilio-sync-config/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-resilio-sync-config/run

root/etc/s6-overlay/s6-rc.d/svc-resilio-sync/notification-fd

@@ -0,0 +1 @@
+3

root/etc/s6-overlay/s6-rc.d/svc-resilio-sync/run

@@ -0,0 +1,6 @@
+#!/usr/bin/with-contenv bash
+
+  exec \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8888" \
+        s6-setuidgid abc rslsync \
+        --nodaemon --config /config/sync.conf

root/etc/s6-overlay/s6-rc.d/svc-resilio-sync/type

@@ -0,0 +1 @@
+longrun

root/etc/services.d/resilio/run

@@ -1,10 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-  if [ -n "${UMASK_SET}" ] && [ -z "${UMASK}" ]; then
-    echo -e "You are using a legacy method of defining umask\nplease update your environment variable from UMASK_SET to UMASK\nto keep the functionality after July 2021"
-    umask ${UMASK_SET}
-  fi
-
-  exec \
-    s6-setuidgid abc rslsync \
-    --nodaemon --config /config/sync.conf