Merge pull request #20 from linuxserver/3.21

Rebase to 3.21

Author: thespad

.github/workflows/external_trigger.yml

@@ -26,7 +26,7 @@ jobs:
           echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
           echo "> External trigger running off of master branch. To disable this trigger, add \`rsnapshot_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
           printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
-          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.21/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
             && awk '/^P:'"rsnapshot"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
           echo "Type is \`alpine_repo\`" >> $GITHUB_STEP_SUMMARY
           if grep -q "^rsnapshot_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
@@ -104,7 +104,7 @@ jobs:
           if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
             echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
             exit 0
-          elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"rsnapshot"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
+          elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.21/main/aarch64/APKINDEX.tar.gz" | tar -xz -C /tmp && awk '/^P:'"rsnapshot"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://') != "${EXT_RELEASE}" ]]; then
             echo "New version \`${EXT_RELEASE}\` found; but not all arch repos updated yet; exiting" >> $GITHUB_STEP_SUMMARY
             FAILURE_REASON="New version ${EXT_RELEASE} for rsnapshot tag latest is detected, however not all arch repos are updated yet. Will try again later."
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.20
+FROM ghcr.io/linuxserver/baseimage-alpine:3.21
 
 # set version label
 ARG BUILD_DATE
@@ -12,13 +12,15 @@ LABEL maintainer="nemchik"
 RUN \
   echo "**** install runtime packages ****" && \
   if [ -z ${RSNAPSHOT_VERSION+x} ]; then \
-    RSNAPSHOT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    RSNAPSHOT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.21/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:rsnapshot$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add --no-cache \
     openssh \
     rsnapshot==${RSNAPSHOT_VERSION} \
     rsync && \
+  rm -rf /etc/rsnapshot.conf && \
+  ln -s /config/rsnapshot.conf /etc/rsnapshot.conf && \
   printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21
 
 # set version label
 ARG BUILD_DATE
@@ -12,13 +12,15 @@ LABEL maintainer="nemchik"
 RUN \
   echo "**** install runtime packages ****" && \
   if [ -z ${RSNAPSHOT_VERSION+x} ]; then \
-    RSNAPSHOT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    RSNAPSHOT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.21/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:rsnapshot$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add --no-cache \
     openssh \
     rsnapshot==${RSNAPSHOT_VERSION} \
     rsync && \
+  rm -rf /etc/rsnapshot.conf && \
+  ln -s /config/rsnapshot.conf /etc/rsnapshot.conf && \
   printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \

Jenkinsfile

@@ -27,8 +27,7 @@ pipeline {
     DEV_DOCKERHUB_IMAGE = 'lsiodev/rsnapshot'
     PR_DOCKERHUB_IMAGE = 'lspipepr/rsnapshot'
     DIST_IMAGE = 'alpine'
-    DIST_TAG = '3.20'
-    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.20/main/'
+    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.21/main/'
     DIST_REPO_PACKAGES = 'rsnapshot'
     MULTIARCH='true'
     CI='true'

README.md

@@ -298,6 +298,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **01.02.25:** - Rebase to Alpine 3.21.
 * **06.03.24:** - Rebase to Alpine 3.20.
 * **23.12.23:** - Rebase to Alpine 3.19, add root periodic crontabs for logrotate.
 * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.

jenkins-vars.yml

@@ -15,8 +15,7 @@ repo_vars:
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/rsnapshot'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/rsnapshot'
   - DIST_IMAGE = 'alpine'
-  - DIST_TAG = '3.20'
-  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.20/main/'
+  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.21/main/'
   - DIST_REPO_PACKAGES = 'rsnapshot'
   - MULTIARCH='true'
   - CI='true'

readme-vars.yml

@@ -23,6 +23,8 @@ opt_param_usage_include_vols: true
 opt_param_volumes:
   - {vol_path: "/.snapshots", vol_host_path: "/path/to/snapshots", desc: "Storage location for all snapshots."}
   - {vol_path: "/data", vol_host_path: "/path/to/data", desc: "Storage location for data to be backed up."}
+readonly_supported: false
+nonroot_supported: false
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
@@ -93,6 +95,7 @@ init_diagram: |
   "rsnapshot:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "01.02.25:", desc: "Rebase to Alpine 3.21."}
   - {date: "06.03.24:", desc: "Rebase to Alpine 3.20."}
   - {date: "23.12.23:", desc: "Rebase to Alpine 3.19, add root periodic crontabs for logrotate."}
   - {date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf."}

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

@@ -5,23 +5,20 @@
 mkdir -p \
     /data
 
-rm -rf /etc/rsnapshot.conf
-ln -s /config/rsnapshot.conf /etc/rsnapshot.conf
-
-# adjust default config
-sed -i -E 's@^#cmd_cp		/bin/cp$@cmd_cp		/bin/cp@g' /etc/rsnapshot.conf.default
-sed -i -E 's@^#cmd_ssh	/usr/bin/ssh$@cmd_ssh	/usr/bin/ssh@g' /etc/rsnapshot.conf.default
-sed -i -E 's@^#cmd_du		/usr/bin/du$@cmd_du		/usr/bin/du@g' /etc/rsnapshot.conf.default
-sed -i -E 's@^#cmd_rsnapshot_diff	/usr/local/bin/rsnapshot-diff$@cmd_rsnapshot_diff	/usr/bin/rsnapshot-diff@g' /etc/rsnapshot.conf.default
-sed -i -E 's@^#logfile	/var/log/rsnapshot$@logfile	/config/rsnapshot.log@g' /etc/rsnapshot.conf.default
-sed -i -E 's@^lockfile	/var/run/rsnapshot.pid$@lockfile	/config/rsnapshot.pid@g' /etc/rsnapshot.conf.default
-sed -i -E 's@^#link_dest	0$@link_dest	1@g' /etc/rsnapshot.conf.default
-sed -i -E 's@^backup	/home/		localhost/$@backup	/data/		localhost/\n#backup	/home/		localhost/@g' /etc/rsnapshot.conf.default
-sed -i -E 's@^backup	/etc/		localhost/$@#backup	/etc/		localhost/@g' /etc/rsnapshot.conf.default
-sed -i -E 's@^backup	/usr/local/	localhost/$@#backup	/usr/local/	localhost/@g' /etc/rsnapshot.conf.default
-
-if [[ ! -f /etc/rsnapshot.conf ]]; then
+if [[ ! -f /config/rsnapshot.conf ]]; then
     cp /etc/rsnapshot.conf.default /config/rsnapshot.conf
+
+    # adjust default config
+    sed -i -E 's@^#cmd_cp		/bin/cp$@cmd_cp		/bin/cp@g' /config/rsnapshot.conf
+    sed -i -E 's@^#cmd_ssh	/usr/bin/ssh$@cmd_ssh	/usr/bin/ssh@g' /config/rsnapshot.conf
+    sed -i -E 's@^#cmd_du		/usr/bin/du$@cmd_du		/usr/bin/du@g' /config/rsnapshot.conf
+    sed -i -E 's@^#cmd_rsnapshot_diff	/usr/local/bin/rsnapshot-diff$@cmd_rsnapshot_diff	/usr/bin/rsnapshot-diff@g' /config/rsnapshot.conf
+    sed -i -E 's@^#logfile	/var/log/rsnapshot$@logfile	/config/rsnapshot.log@g' /config/rsnapshot.conf
+    sed -i -E 's@^lockfile	/var/run/rsnapshot.pid$@lockfile	/config/rsnapshot.pid@g' /config/rsnapshot.conf
+    sed -i -E 's@^#link_dest	0$@link_dest	1@g' /config/rsnapshot.conf
+    sed -i -E 's@^backup	/home/		localhost/$@backup	/data/		localhost/\n#backup	/home/		localhost/@g' /config/rsnapshot.conf
+    sed -i -E 's@^backup	/etc/		localhost/$@#backup	/etc/		localhost/@g' /config/rsnapshot.conf
+    sed -i -E 's@^backup	/usr/local/	localhost/$@#backup	/usr/local/	localhost/@g' /config/rsnapshot.conf
 fi
 
 # permissions