Rebase to Alpine 3.19, add root periodic crontabs for logrotate

Signed-off-by: Eric Nemchik <[email protected]>

Author: nemchik

.github/workflows/external_trigger.yml

@@ -20,7 +20,7 @@ jobs:
           echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_RSNAPSHOT_MASTER\". ****"
           echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_RSNAPSHOT_MASTER\`" >> $GITHUB_STEP_SUMMARY
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
             && awk '/^P:'"rsnapshot"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"
@@ -74,7 +74,7 @@ jobs:
             echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
             echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
             exit 0
-          elif [[ $(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.18/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.19/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 ****"
             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."

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.18
+FROM ghcr.io/linuxserver/baseimage-alpine:3.19
 
 # set version label
 ARG BUILD_DATE
@@ -12,7 +12,7 @@ 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.18/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    RSNAPSHOT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/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 \

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
 
 # set version label
 ARG BUILD_DATE
@@ -12,7 +12,7 @@ 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.18/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    RSNAPSHOT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/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 \

Jenkinsfile

@@ -24,8 +24,8 @@ pipeline {
     DEV_DOCKERHUB_IMAGE = 'lsiodev/rsnapshot'
     PR_DOCKERHUB_IMAGE = 'lspipepr/rsnapshot'
     DIST_IMAGE = 'alpine'
-    DIST_TAG = '3.18'
-    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.18/main/'
+    DIST_TAG = '3.19'
+    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.19/main/'
     DIST_REPO_PACKAGES = 'rsnapshot'
     MULTIARCH='true'
     CI='true'

README.md

@@ -100,7 +100,7 @@ services:
       - PGID=1000
       - TZ=Etc/UTC
     volumes:
-      - /path/to/appdata:/config
+      - /path/to/rsnapshot/config:/config
       - /path/to/snapshots:/.snapshots #optional
       - /path/to/data:/data #optional
     restart: unless-stopped
@@ -114,7 +114,7 @@ docker run -d \
   -e PUID=1000 \
   -e PGID=1000 \
   -e TZ=Etc/UTC \
-  -v /path/to/appdata:/config \
+  -v /path/to/rsnapshot/config:/config \
   -v /path/to/snapshots:/.snapshots `#optional` \
   -v /path/to/data:/data `#optional` \
   --restart unless-stopped \
@@ -130,7 +130,7 @@ Containers are configured using parameters passed at runtime (such as those abov
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-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` | Contains all relevant configuration files. |
+| `-v /config` | Persistent config files |
 | `-v /.snapshots` | Storage location for all snapshots. |
 | `-v /data` | Storage location for data to be backed up. |
 
@@ -310,6 +310,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **23.12.23:** - Rebase to Alpine 3.19, add root periodic crontabs for logrotate.
 * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
 * **02.03.23:** - Split cron into separate init step and set crontab permissions.
 * **15.12.22:** - Rebase to alpine 3.17.

jenkins-vars.yml

@@ -16,8 +16,8 @@ repo_vars:
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/rsnapshot'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/rsnapshot'
   - DIST_IMAGE = 'alpine'
-  - DIST_TAG = '3.18'
-  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.18/main/'
+  - DIST_TAG = '3.19'
+  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.19/main/'
   - DIST_REPO_PACKAGES = 'rsnapshot'
   - MULTIARCH='true'
   - CI='true'

readme-vars.yml

@@ -19,7 +19,7 @@ common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "/path/to/appdata", desc: "Contains all relevant configuration files." }
+  - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" }
 param_usage_include_env: true
 param_env_vars:
   - { env_var: "TZ", env_value: "America/New_York", desc: "Specify a timezone to use EG America/New_York"}
@@ -58,6 +58,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { 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." }
   - { date: "02.03.23:", desc: "Split cron into separate init step and set crontab permissions." }
   - { date: "15.12.22:", desc: "Rebase to alpine 3.17." }

root/defaults/crontabs/root

@@ -1,3 +1,9 @@
 # min   hour    day     month   weekday command
+*/15    *       *       *       *       run-parts /etc/periodic/15min
+0       *       *       *       *       run-parts /etc/periodic/hourly
+0       2       *       *       *       run-parts /etc/periodic/daily
+0       3       *       *       6       run-parts /etc/periodic/weekly
+0       5       1       *       *       run-parts /etc/periodic/monthly
+
 #0       */4     *       *       *       rsnapshot alpha
 #50      23      *       *       *       rsnapshot beta