Merge pull request 'chore(deps): update docker docker tag to v29.4.3' (#87) from renovate/docker-29.x into main

Reviewed-on: coop-cloud/backup-bot-two#87

.drone.yml

@@ -5,9 +5,9 @@ steps:
   - name: publish image
     image: plugins/docker
     settings:
-      username: 3wordchant
+      username: abra-bot
       password:
-        from_secret: git_coopcloud_tech_token_3wc
+        from_secret: git_coopcloud_tech_token_abra_bot
       repo: git.coopcloud.tech/coop-cloud/backup-bot-two
       tags: ${DRONE_SEMVER_BUILD}
       registry: git.coopcloud.tech

.env.sample

@@ -4,6 +4,8 @@ SECRET_RESTIC_PASSWORD_VERSION=v1
 
 COMPOSE_FILE=compose.yml
 
+#TIMEOUT=
+
 RESTIC_REPOSITORY=/backups/restic
 
 CRON_SCHEDULE='30 3 * * *'

Dockerfile

@@ -1,11 +1,10 @@
-FROM docker:24.0.7-dind
+FROM docker:29.4.3-dind
 
 RUN apk add --upgrade --no-cache restic bash python3 py3-pip py3-click py3-docker-py py3-json-logger curl
 
-# Todo use requirements file with specific versions
+RUN pip install --break-system-packages resticpy==1.3.0
-RUN pip install --break-system-packages resticpy==1.0.2
 
 COPY backupbot.py /usr/bin/backup
 COPY entrypoint.sh /entrypoint.sh
 
-ENTRYPOINT /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]

README.md

@@ -79,10 +79,8 @@ Add the key to your `authorized_keys`:
 `ssh-copy-id -i backupkey <user>@<hostname>`
 Add your `SSH_KEY` as docker secret:
 ```
-abra app secret insert <backupbot_name> ssh_key v1 """$(cat backupkey)
+cat backupkey | abra app secret insert <backupbot_name> ssh_key v1
-"""
 ```
-> Attention: This command needs to be executed exactly as stated above, because it places a trailing newline at the end, if this is missing you will get the following error: `Load key "/run/secrets/ssh_key": error in libcrypto`
 
 ### Restic REST server Storage
 
@@ -139,55 +137,57 @@ Enable basic auth in the env file, by uncommenting the following line:
 
 ## Usage
 
-Run the cronjob that creates a backup, including the push notifications and docker logging:
+### Run the cronjob that creates a backup, including the push notifications and docker logging:
+
 `abra app cmd <backupbot_name> app run_cron`
 
-Create a backup of all apps:
+### Create a backup of all apps:
 
 `abra app run <backupbot_name> app -- backup create`
 
 > The apps to backup up need to be deployed
 
-Create an individual backup:
+### Create an individual backup:
 
 `abra app run <backupbot_name> app -- backup --host <target_app_name> create`
 
-Create a backup to a local repository:
+### Create a backup to a local repository:
 
 `abra app run <backupbot_name> app -- backup create -r /backups/restic`
 
 > It is recommended to shutdown/undeploy an app before restoring the data
 
-Restore the latest snapshot of all including apps:
+### Restore the latest snapshot of all including apps:
 
 `abra app run <backupbot_name> app -- backup restore`
 
-Restore a specific snapshot of an individual app:
+### Restore a specific snapshot of an individual app:
 
 `abra app run <backupbot_name> app -- backup --host <target_app_name> restore --snapshot <snapshot_id>`
 
-Show all snapshots:
+### Show all snapshots:
 
 `abra app run <backupbot_name> app -- backup snapshots`
 
-Show all snapshots containing a specific app:
+### Show all snapshots containing a specific app:
 
 `abra app run <backupbot_name> app -- backup --host <target_app_name> snapshots`
 
-Show all files inside the latest snapshot (can be very verbose):
+### Show all files inside the latest snapshot (can be very verbose):
 
 `abra app run <backupbot_name> app -- backup ls`
 
-Show specific files inside a selected snapshot:
+### Show specific files inside a selected snapshot:
 
 `abra app run <backupbot_name> app -- backup ls --snapshot <snapshot_id> /var/lib/docker/volumes/`
 
-Download files from a snapshot:
+### Download files from a snapshot:
 
-```
+`abra app run <backupbot_name> app -- backup download --snapshot <snapshot_id> --path <absolute_path>`
-filename=$(abra app run <backupbot_name> app -- backup download --snapshot <snapshot_id> --path <absolute_path>)
+
-abra app cp <backupbot_name> app:$filename .
+extract the <path> from the output of the first command and use in the second.
-```
+
+`abra app cp <backupbot_name> app:<path> .`
 
 ## Run restic
 

abra.sh

@@ -1,6 +1,6 @@
 export SSH_CONFIG_VERSION=v1
 export ENTRYPOINT_VERSION=v17
-export CRONJOB_VERSION=v2
+export CRONJOB_VERSION=v3
 
 run_cron () {
     schedule="$(crontab -l | tr -s " " | cut -d ' ' -f-5)"

compose.swarm-cronjob.yml

@@ -7,9 +7,7 @@ services:
       replicas: 0
       labels:
         - "swarm.cronjob.enable=true"
-        # Note(3wc): every 5m, testing
+        - "swarm.cronjob.schedule=${CRON_SCHEDULE}"
-        - "swarm.cronjob.schedule=*/5 * * * *"
-        # Note(3wc): blank label to be picked up by `abra recipe sync`
       restart_policy:
         condition: none
     entrypoint: [ "/usr/bin/backup.sh" ]

compose.yml

@@ -2,7 +2,7 @@
 version: "3.8"
 services:
   app:
-    image: git.coopcloud.tech/coop-cloud/backup-bot-two:2.3.0-beta
+    image: git.coopcloud.tech/coop-cloud/backup-bot-two:2.4.0
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
       - "/var/lib/docker/volumes/:/var/lib/docker/volumes/"
@@ -23,8 +23,8 @@ services:
         mode: 666
     deploy:
       labels:
-        - coop-cloud.${STACK_NAME}.version=2.3.0+2.3.0-beta
+        - coop-cloud.${STACK_NAME}.version=2.4.0+2.4.0
-        - coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-300}
+        - coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}
         - coop-cloud.backupbot.enabled=true
     #entrypoint: ['tail', '-f','/dev/null']
     healthcheck:

cronjob.sh

@@ -4,7 +4,7 @@ set -e
 
 CURL_OPTS="-s"
 # Check for basic auth
-if [ -n "$(cat /run/secrets/push_basicauth)" ]
+if [ -s /run/secrets/push_basicauth ]
 then
     CURL_OPTS="$CURL_OPTS -u $(cat /run/secrets/push_basicauth)"
 fi
@@ -32,7 +32,8 @@ else
 fi
 
 eval "$push_start_notification"
-if [ "$(backup --machine-logs create  2>&1 | tee /tmp/backup.log && (grep -q 'backup finished' /tmp/backup.log))" ]
+backup --machine-logs create 2>&1 | tee /tmp/backup.log
+if grep -q 'backup finished' /tmp/backup.log
 then
     eval "$push_success_notification"
 else