added custom packages in s6

README.md

@@ -36,7 +36,7 @@ It uses cron to run the backups at a time you can configure in `data/borgmatic.d
 | Variable | Description | Possible Values | Default |
 | :----: | --- | --- | --- |
 | DOCKERCLI | Install DockerCLI and ComposeCLI | true | Empty |
-| EXTRA_PKGS | Install additional packages | postgresql16 libecpg <other packages> | Empty |
+| EXTRA_PKGS | Install additional packages | rclone coreutils jq other_packages | Empty |
 | CRON | Cron times | cron time, false | 0 1 * * * |
 | CRON_COMMAND | Command cron will run | borgmatic --stats -v 0 2>&1 | borgmatic --stats -v 0 2>&1 |
 | EXTRA_CRON | Extra cron lines | 0 5 2 * * command1 | Empty |

base-fullbuild/Dockerfile

@@ -74,7 +74,7 @@ RUN --mount=type=cache,id=pip,target=/root/.cache,sharing=locked \
     borgmatic --bash-completion > "$(pkg-config --variable=completionsdir bash-completion)"/borgmatic
 EOF
 
-COPY --link root/ /
+COPY --chmod=744 --link root/ /
 
 VOLUME /root/.borgmatic
 VOLUME /root/.config/borg

base-fullbuild/root/etc/s6-overlay/s6-rc.d/init-custom-packages/run

@@ -0,0 +1,14 @@
+#!/usr/bin/with-contenv bash
+
+# Install DockerCLI if true
+if [ "${DOCKERCLI}" == "true" ]; then
+  echo "Installing Docker CLI and Compose..."
+  apk add -U --quiet docker-cli docker-cli-compose
+fi
+
+# Install additional packages
+if [ -v EXTRA_PKGS ]
+then
+    echo Installing extra packages: "$EXTRA_PKGS"
+    apk add -U --quiet $EXTRA_PKGS
+fi

base-fullbuild/root/etc/s6-overlay/s6-rc.d/init-custom-packages/type

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

base-fullbuild/root/etc/s6-overlay/s6-rc.d/init-custom-packages/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-custom-packages/run

base-fullbuild/root/etc/s6-overlay/s6-rc.d/svc-cron/run

@@ -1,29 +1,19 @@
 #!/usr/bin/with-contenv bash
 
-# Install DockerCLI if true
-if [ "${DOCKERCLI:-}" == "true" ]; then
-  echo "Installing Docker CLI and Compose..."
-  apk add -U --quiet docker-cli docker-cli-compose
-  dockerver=$(docker --version | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')
-  composever=$(docker compose version | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')
-else
-  dockerver="not installed"
-  composever="not installed"
-fi
-
-# Install additional packages
-if [ -v EXTRA_PKGS ]
-then
-    echo Installing extra packages: "$EXTRA_PKGS"
-    apk add -U --quiet $EXTRA_PKGS
-fi
-
 # Version variables
 borgver=$(borg --version)
 borgmaticver=$(borgmatic --version)
 apprisever=$(apprise --version | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')
 pythonver=$(python3 --version | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')
 
+if [ "${DOCKERCLI}" == "true" ]; then
+  dockerver=$(docker --version | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')
+  composever=$(docker compose version | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')
+else
+  dockerver="not installed"
+  composever="not installed"
+fi
+
 # Software versions
 echo "Software Versions:
 -----------------------------------