Don't duplicate stack name in vol path

.drone.yml

@@ -0,0 +1,17 @@
+---
+kind: pipeline
+name: linters
+steps:
+  - name: publish image
+    image: plugins/docker
+    settings:
+      username: 3wordchant
+      password:
+        from_secret: git_coopcloud_tech_token_3wc
+      repo: git.coopcloud.tech/coop-cloud/backup-bot-two
+      tags: 2.0.0
+      registry: git.coopcloud.tech
+    when:
+      event:
+        exclude:
+          - pull_request

.env.sample

@@ -1,10 +1,29 @@
-STACK_NAME=backup-bot-two
+TYPE=backup-bot-two
+
+SECRET_RESTIC_PASSWORD_VERSION=v1
+
+COMPOSE_FILE=compose.yml
 
 RESTIC_REPOSITORY=/backups/restic
 
 CRON_SCHEDULE='30 3 * * *'
 
-# Push Notifications
-#PUSH_URL_START=https://status.example.com/api/push/xxxxxxxxxx?status=up&msg=start
-#PUSH_URL_SUCCESS=https://status.example.com/api/push/xxxxxxxxxx?status=up&msg=OK
-#PUSH_URL_FAIL=https://status.example.com/api/push/xxxxxxxxxx?status=down&msg=fail
+# swarm-cronjob, instead of built-in cron
+#COMPOSE_FILE="$COMPOSE_FILE:compose.swarm-cronjob.yml"
+
+# SSH storage
+#SECRET_SSH_KEY_VERSION=v1
+#SSH_HOST_KEY="hostname ssh-rsa AAAAB3...
+#COMPOSE_FILE="$COMPOSE_FILE:compose.ssh.yml"
+
+# S3 storage
+#SECRET_AWS_SECRET_ACCESS_KEY_VERSION=v1
+#AWS_ACCESS_KEY_ID=something-secret
+#COMPOSE_FILE="$COMPOSE_FILE:compose.s3.yml"
+
+# Secret restic repository
+# use a secret to store the RESTIC_REPOSITORY if the repository location contains a secret value
+# i.E rest:https://user:SECRET_PASSWORD@host:8000/
+# it overwrites the RESTIC_REPOSITORY variable
+#SECRET_RESTIC_REPO_VERSION=v1
+#COMPOSE_FILE="$COMPOSE_FILE:compose.secret.yml"

.envrc.sample

@@ -0,0 +1,17 @@
+export RESTIC_HOST="user@domain.tld"
+export RESTIC_PASSWORD_FILE=/run/secrets/restic-password
+export BACKUP_DEST=/backups
+
+export SERVER_NAME=domain.tld
+export DOCKER_CONTEXT=$SERVER_NAME
+
+# uncomment either this:
+#export SSH_KEY_FILE=~/.ssh/id_rsa
+# or this:
+#export AWS_SECRET_ACCESS_KEY_FILE=s3
+#export AWS_ACCESS_KEY_ID=easter-october-emphatic-tug-urgent-customer
+# or this:
+#export HTTPS_PASSWORD_FILE=/run/secrets/https_password
+
+# optionally limit subset of services for testing
+#export SERVICES_OVERRIDE="ghost_domain_tld_app ghost_domain_tld_db"

.gitignore

@@ -1 +1 @@
-.env
+/testing

Dockerfile

@@ -0,0 +1,10 @@
+FROM docker:24.0.7-dind
+
+RUN apk add --upgrade --no-cache restic bash python3 py3-pip
+
+# Todo use requirements file with specific versions
+RUN pip install click==8.1.7 docker==6.1.3 resticpy==1.0.2
+
+COPY backupbot.py /usr/bin/backup
+
+ENTRYPOINT /bin/bash

README.md

@@ -1,115 +1,168 @@
 # Backupbot II
 
-Wiki Cafe's configuration for a Backupbot II deployment. Originally slimmed down from an `abra` [recipe](https://git.coopcloud.tech/coop-cloud/backup-bot-two) by [Co-op Cloud](https://coopcloud.tech/).
+[![Build Status](https://build.coopcloud.tech/api/badges/coop-cloud/backup-bot-two/status.svg)](https://build.coopcloud.tech/coop-cloud/backup-bot-two)
+
+_This Time, It's Easily Configurable_
+
+Automatically take backups from all volumes of running Docker Swarm services and runs pre- and post commands.
+
+<!-- metadata -->
+
+* **Category**: Utilities
+* **Status**: 0, work-in-progress
+* **Image**: [`thecoopcloud/backup-bot-two`](https://hub.docker.com/r/thecoopcloud/backup-bot-two), 4, upstream
+* **Healthcheck**: No
+* **Backups**: N/A
+* **Email**: N/A
+* **Tests**: No
+* **SSO**: N/A
+
+<!-- endmetadata -->
 
 
-## Deploying the app with Docker Swarm
+## Background
 
-Set the environment variables from the .env file during the shell session.
+There are lots of Docker volume backup systems; all of them have one or both of these limitations:
+ - You need to define all the volumes to back up in the configuration system
+ - Backups require services to be stopped to take consistent copies
 
+Backupbot II tries to help, by
+1. **letting you define backups using Docker labels**, so you can **easily collect your backups for use with another system** like docker-volume-backup.
+2. **running pre- and post-commands** before and after backups, for example to use database tools to take a backup from a running service.
+
+## Deployment
+
+### With Co-op Cloud
+
+
+* `abra app new backup-bot-two`
+* `abra app config <app-name>`
+    - set storage options. Either configure `CRON_SCHEDULE`, or set up `swarm-cronjob`
+* `abra app secret generate -a <app_name>`
+* `abra app deploy <app-name>`
+
+## Configuration
+
+Per default Backupbot stores the backups locally in the repository `/backups/restic`, which is accessible as volume at `/var/lib/docker/volumes/<app_name>_backups/_data/restic/`
+
+The backup location can be changed using the `RESTIC_REPOSITORY` env variable.
+
+### S3 Storage
+
+To use S3 storage as backup location set the following envs:
 ```
-set -a && source .env && set +a
+RESTIC_REPOSITORY=s3:<S3-SERVICE-URL>/<BUCKET-NAME>
+SECRET_AWS_SECRET_ACCESS_KEY_VERSION=v1
+AWS_ACCESS_KEY_ID=<MY_ACCESS_KEY>
+COMPOSE_FILE="$COMPOSE_FILE:compose.s3.yml"
+```
+and add your `<SECRET_ACCESS_KEY>` as docker secret:
+`abra app secret insert <app_name> aws_secret_access_key v1 <SECRET_ACCESS_KEY>`
+
+See [restic s3 docs](https://restic.readthedocs.io/en/latest/030_preparing_a_new_repo.html#amazon-s3) for more information.
+
+### SFTP Storage
+
+> With sftp it is not possible to prevent the backupbot from deleting backups in case of a compromised machine. Therefore we recommend to use S3, REST or rclone server without delete permissions.
+
+To use SFTP storage as backup location set the following envs:
+```
+RESTIC_REPOSITORY=sftp:user@host:/restic-repo-path
+SECRET_SSH_KEY_VERSION=v1
+SSH_HOST_KEY="hostname ssh-rsa AAAAB3...
+COMPOSE_FILE="$COMPOSE_FILE:compose.ssh.yml"
+```
+To get the `SSH_HOST_KEY` run the following command `ssh-keyscan <hostname>`
+
+Generate an ssh keypair: `ssh-keygen -t ed25519 -f backupkey -P ''`
+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 <app_name> ssh_key v1 """$(cat backupkey)
+"""
 ```
 
-Set the secrets.
+### Restic REST server Storage
+
+You can simply set the `RESTIC_REPOSITORY` variable to your REST server URL `rest:http://host:8000/`.
+If you access the REST server with a password `rest:https://user:pass@host:8000/` you should hide the whole URL containing the password inside a secret.
+Uncomment these lines:
+```
+SECRET_RESTIC_REPO_VERSION=v1
+COMPOSE_FILE="$COMPOSE_FILE:compose.secret.yml"
+```
+Add your REST server url as secret:
+```
+`abra app secret insert <app_name> restic_repo v1 "rest:https://user:pass@host:8000/"`
+```
+The secret will overwrite the `RESTIC_REPOSITORY` variable.
+
+
+See [restic REST docs](https://restic.readthedocs.io/en/latest/030_preparing_a_new_repo.html#rest-server) for more information.
+
+## Usage
+
+
+Create a backup of all apps:
+
+`abra app run <app_name> app -- backup create`
+
+> The apps to backup up need to be deployed
+
+Create an individual backup:
+
+`abra app run <app_name> app -- backup --host <target_app_name> create`
+
+Create a backup to a local repository:
+
+`abra app run <app_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:
+
+`abra app run <app_name> app -- backup restore`
+
+Restore a specific snapshot of an individual app:
+
+`abra app run <app_name> app -- backup --host <target_app_name> restore --snapshot <snapshot_id>`
+
+Show all snapshots:
+
+`abra app run <app_name> app -- backup snapshots`
+
+Show all snapshots containing a specific app:
+
+`abra app run <app_name> app -- backup --host <target_app_name> snapshots`
+
+Show all files inside the latest snapshot (can be very verbose):
+
+`abra app run <app_name> app -- backup ls`
+
+Show specific files inside a selected snapshot:
+
+`abra app run <app_name> app -- backup ls --snapshot <snapshot_id> --path /var/lib/docker/volumes/`
+
+Download files from a snapshot:
 
 ```
-printf "SECRET_HERE" | docker secret create SECRET_NAME -
+filename=$(abra app run <app_name> app -- backup download --snapshot <snapshot_id> --path <absolute_path>)
+abra app cp <app_name> app:$filename .
 ```
 
-Deploy using the `-c` flag to specify one or multiple compose files.
+## Run restic
 
 ```
-docker stack deploy backup-bot-two -c compose.yaml
+abra app run <app_name> app bash
+export AWS_SECRET_ACCESS_KEY=$(cat $AWS_SECRET_ACCESS_KEY_FILE)
+export RESTIC_PASSWORD=$(cat $RESTIC_PASSWORD_FILE)
+restic snapshots
 ```
 
-## Push notifications
-
-The following env variables can be used to setup push notifications for backups. `PUSH_URL_START` is requested just before the backups starts, `PUSH_URL_SUCCESS` is only requested if the backup was successful and if the backup fails `PUSH_URL_FAIL` will be requested.
-Each variable is optional and independent of the other.
-```
-
-PUSH_URL_START=https://status.example.com/api/push/xxxxxxxxxx?status=up&msg=start
-PUSH_URL_SUCCESS=https://status.example.com/api/push/xxxxxxxxxx?status=up&msg=OK
-PUSH_URL_FAIL=https://status.example.com/api/push/xxxxxxxxxx?status=down&msg=fail
-```
-
-## Commands
-
-
-- Find the ID or name of the backup container:
-   ```
-   docker ps --filter "name=backup-bot-two_app"
-   ```
-
-2. Run the desired command using `docker exec`:
-   ```
-   docker exec -it <container_id_or_name> backup <command> [options]
-   ```
-   Replace `<container_id_or_name>` with the ID or name of the backup container.
-
-   Available commands:
-   - `create`: Initiate the backup process.
-   - `restore`: Restore a specific snapshot to a target directory.
-   - `snapshots`: List available snapshots.
-   - `ls`: List files in a specific snapshot.
-   - `download`: Download specific files, volumes, or secrets from a snapshot.
-
-   Options:
-   - `--host`, `-h`: Specify the service name (e.g., `app`).
-   - `--repo`, `-r`: Specify the Restic repository location (e.g., `/run/secrets/restic_repo`).
-   - `--log`, `-l`: Set the log level (e.g., `debug`, `info`, `warning`, `error`).
-   - `--machine-logs`, `-m`: Enable machine-readable JSON logging.
-
-## Examples
-
-Create a backup:
-
-```
-docker exec -it <container_id_or_name> backup create --host app
-```
-
-Restore a snapshot:
-
-```
-docker exec -it <container_id_or_name> backup restore --snapshot <snapshot_id> --target /path/to/restore
-```
-
-List snapshots:
-
-  ```
-  docker exec -it <container_id_or_name> backup snapshots
-  ```
-
-List files in a snapshot:
-
-```
-docker exec -it <container_id_or_name> backup ls --snapshot <snapshot_id> --path /path/to/directory
-```
-
-Download files, volumes, or secrets from a snapshot:
-
-```
-docker exec -it <container_id_or_name> backup download --snapshot <snapshot_id> [--path /path/to/file] [--volumes] [--secrets]
-```
-
-Note: Make sure to replace `<container_id_or_name>` and `<snapshot_id>` with the appropriate values for your setup.
-
-Remember to review and adjust the Docker Compose file and environment variables according to your specific requirements before running the backup commands.
-
-When using `docker exec`, you don't need to specify the volume mounts or the Restic repository location as command-line arguments because they are already defined in the Docker Compose file and are available within the running container.
-
-If you need to access the downloaded files, volumes, or secrets from the backup, you can use `docker cp` to copy them from the container to the host machine:
-
-```
-docker cp <container_id_or_name>:/path/to/backup/file /path/on/host
-```
-
-This allows you to retrieve the backed-up data from the container.
-
 ## Recipe Configuration
 
-Backupbot II uses access to the Docker socket to read labels from running Docker Swarm services:
+Like Traefik, or `swarm-cronjob`, Backupbot II uses access to the Docker socket to read labels from running Docker Swarm services:
 
 ```
 services:
@@ -126,3 +179,5 @@ services:
 - `backupbot.backup.post-hook` -- command to run after copying files (optional)
 
 As in the above example, you can reference Docker Secrets, e.g. for looking up database passwords, by reading the files in `/run/secrets` directly.
+
+[abra]: https://git.autonomic.zone/autonomic-cooperative/abra

abra.sh

@@ -0,0 +1,3 @@
+export ENTRYPOINT_VERSION=v2
+export BACKUPBOT_VERSION=v1
+export SSH_CONFIG_VERSION=v1

backupbot.py

@@ -1,7 +1,6 @@
 #!/usr/bin/python3
 
 import os
-import sys
 import click
 import json
 import subprocess
@@ -10,40 +9,22 @@ import docker
 import restic
 import tarfile
 import io
-from pythonjsonlogger import jsonlogger
 from datetime import datetime, timezone
 from restic.errors import ResticFailedError
 from pathlib import Path
 from shutil import copyfile, rmtree
+# logging.basicConfig(level=logging.INFO)
 
 VOLUME_PATH = "/var/lib/docker/volumes/"
 SECRET_PATH = '/secrets/'
 SERVICE = None
 
-logger = logging.getLogger("backupbot")
-logging.addLevelName(55, 'SUMMARY')
-setattr(logging, 'SUMMARY', 55)
-setattr(logger, 'summary', lambda message, *args, **
-        kwargs: logger.log(55, message, *args, **kwargs))
-
-
-def handle_exception(exc_type, exc_value, exc_traceback):
-    if issubclass(exc_type, KeyboardInterrupt):
-        sys.__excepthook__(exc_type, exc_value, exc_traceback)
-        return
-    logger.critical("Uncaught exception", exc_info=(
-        exc_type, exc_value, exc_traceback))
-
-
-sys.excepthook = handle_exception
-
 
 @click.group()
 @click.option('-l', '--log', 'loglevel')
-@click.option('-m', '--machine-logs', 'machine_logs', is_flag=True)
 @click.option('service', '--host', '-h', envvar='SERVICE')
-@click.option('repository', '--repo', '-r', envvar='RESTIC_REPOSITORY')
-def cli(loglevel, service, repository, machine_logs):
+@click.option('repository', '--repo', '-r', envvar='RESTIC_REPOSITORY', required=True)
+def cli(loglevel, service, repository):
     global SERVICE
     if service:
         SERVICE = service.replace('.', '_')
@@ -53,21 +34,14 @@ def cli(loglevel, service, repository, machine_logs):
         numeric_level = getattr(logging, loglevel.upper(), None)
         if not isinstance(numeric_level, int):
             raise ValueError('Invalid log level: %s' % loglevel)
-        logger.setLevel(numeric_level)
-    if machine_logs:
-        logHandler = logging.StreamHandler()
-        formatter = jsonlogger.JsonFormatter(
-            "%(levelname)s %(filename)s %(lineno)s %(process)d %(message)s", rename_fields={"levelname": "message_type"})
-        logHandler.setFormatter(formatter)
-        logger.addHandler(logHandler)
-
+        logging.basicConfig(level=numeric_level)
     export_secrets()
     init_repo()
 
 
 def init_repo():
     repo = os.environ['RESTIC_REPOSITORY']
-    logger.debug(f"set restic repository location: {repo}")
+    logging.debug(f"set restic repository location: {repo}")
     restic.repository = repo
     restic.password_file = '/var/run/secrets/restic_password'
     try:
@@ -75,7 +49,7 @@ def init_repo():
     except ResticFailedError as error:
         if 'unable to open config file' in str(error):
             result = restic.init()
-            logger.info(f"Initialized restic repo: {result}")
+            logging.info(f"Initialized restic repo: {result}")
         else:
             raise error
 
@@ -83,25 +57,20 @@ def init_repo():
 def export_secrets():
     for env in os.environ:
         if env.endswith('FILE') and not "COMPOSE_FILE" in env:
-            logger.debug(f"exported secret: {env}")
+            logging.debug(f"exported secret: {env}")
             with open(os.environ[env]) as file:
                 secret = file.read()
                 os.environ[env.removesuffix('_FILE')] = secret
-
-            if env == 'RESTIC_REPOSITORY_FILE':
-                # RESTIC_REPOSITORY_FILE and RESTIC_REPOSITORY are mutually exclusive
-                logger.info("RESTIC_REPOSITORY set to RESTIC_REPOSITORY_FILE. Unsetting RESTIC_REPOSITORY_FILE.")
-                del os.environ['RESTIC_REPOSITORY_FILE']
+                # logging.debug(f"Read secret value: {secret}")
 
 
 @cli.command()
-@click.option('retries', '--retries', '-r', envvar='RETRIES', default=1)
-def create(retries):
+def create():
     pre_commands, post_commands, backup_paths, apps = get_backup_cmds()
     copy_secrets(apps)
     backup_paths.append(SECRET_PATH)
     run_commands(pre_commands)
-    backup_volumes(backup_paths, apps, int(retries))
+    backup_volumes(backup_paths, apps)
     run_commands(post_commands)
 
 
@@ -116,18 +85,24 @@ def get_backup_cmds():
     services = client.services.list()
     for s in services:
         labels = s.attrs['Spec']['Labels']
+        mounts = s.attrs['Spec']['TaskTemplate']['ContainerSpec']['Mounts']
         if (backup := labels.get('backupbot.backup')) and bool(backup):
-            # volumes: s.attrs['Spec']['TaskTemplate']['ContainerSpec']['Mounts'][0]['Source']
             stack_name = labels['com.docker.stack.namespace']
             # Remove this lines to backup only a specific service
             # This will unfortenately decrease restice performance
             # if SERVICE and SERVICE != stack_name:
             #     continue
             backup_apps.add(stack_name)
-            backup_paths = backup_paths.union(
-                Path(VOLUME_PATH).glob(f"{stack_name}_*"))
+            for mount in mounts:
+                if path := labels.get('backupbot.backup.path'):
+                    path_ = Path(VOLUME_PATH) / f"{mount['Source']}/_data/{path}"
+                else:
+                    path_ = Path(VOLUME_PATH) / f"{mount['Source']}"
+                logging.debug(
+                    f"Added backup path {path_}")
+                backup_paths.add(path_)
             if not (container := container_by_service.get(s.name)):
-                logger.error(
+                logging.error(
                     f"Container {s.name} is not running, hooks can not be executed")
                 continue
             if prehook := labels.get('backupbot.backup.pre-hook'):
@@ -150,15 +125,14 @@ def copy_secrets(apps):
         if (app_name in apps and
                 (app_secs := s.attrs['Spec']['TaskTemplate']['ContainerSpec'].get('Secrets'))):
             if not container_by_service.get(s.name):
-                logger.error(
+                logging.error(
                     f"Container {s.name} is not running, secrets can not be copied.")
                 continue
             container_id = container_by_service[s.name].id
             for sec in app_secs:
                 src = f'/var/lib/docker/containers/{container_id}/mounts/secrets/{sec["SecretID"]}'
                 if not Path(src).exists():
-                    logger.error(
-                        f"For the secret {sec['SecretName']} the file {src} does not exist for {s.name}")
+                    logging.error(f"For the secret {sec['SecretName']} the file {src} does not exist for {s.name}")
                     continue
                 dst = SECRET_PATH + sec['SecretName']
                 copyfile(src, dst)
@@ -169,42 +143,37 @@ def run_commands(commands):
         if not command:
             continue
         # Remove bash/sh wrapping
-        command = command.removeprefix('bash -c').removeprefix('sh -c').removeprefix(' ')
+        command = command.removeprefix('bash -c').removeprefix('sh -c')
         # Remove quotes surrounding the command
         if (len(command) >= 2 and command[0] == command[-1] and (command[0] == "'" or command[0] == '"')):
-            command = command[1:-1]
+            command[1:-1]
         # Use bash's pipefail to return exit codes inside a pipe to prevent silent failure
         command = f"bash -c 'set -o pipefail;{command}'"
-        logger.info(f"run command in {container.name}:")
-        logger.info(command)
+        logging.info(f"run command in {container.name}:")
+        logging.info(command)
         result = container.exec_run(command)
         if result.exit_code:
-            logger.error(
+            logging.error(
                 f"Failed to run command {command} in {container.name}: {result.output.decode()}")
         else:
-            logger.info(result.output.decode())
+            logging.info(result.output.decode())
 
 
-def backup_volumes(backup_paths, apps, retries, dry_run=False):
-    while True:
+def backup_volumes(backup_paths, apps, dry_run=False):
     try:
         result = restic.backup(backup_paths, dry_run=dry_run, tags=apps)
-            logger.summary("backup finished", extra=result)
-            return
+        print(result)
+        logging.info(result)
     except ResticFailedError as error:
-            logger.error(
-                f"Backup failed for {apps}. Could not Backup these paths: {backup_paths}")
-            logger.error(error, exc_info=True)
-            if retries > 0:
-                retries -= 1
-            else:
+        logging.error(f"Backup failed for {apps}. Could not Backup these paths: {backup_paths}")
+        logging.error(error)
         exit(1)
 
 
 @cli.command()
 @click.option('snapshot', '--snapshot', '-s', envvar='SNAPSHOT', default='latest')
 @click.option('target', '--target', '-t', envvar='TARGET', default='/')
-@click.option('noninteractive', '--noninteractive', envvar='NONINTERACTIVE', is_flag=True)
+@click.option('noninteractive', '--noninteractive', envvar='NONINTERACTIVE', default=False)
 def restore(snapshot, target, noninteractive):
     # Todo: recommend to shutdown the container
     service_paths = VOLUME_PATH
@@ -212,7 +181,7 @@ def restore(snapshot, target, noninteractive):
         service_paths = service_paths + f'{SERVICE}_*'
     snapshots = restic.snapshots(snapshot_id=snapshot)
     if not snapshot:
-        logger.error("No Snapshots with ID {snapshots}")
+        logging.error("No Snapshots with ID {snapshots}")
         exit(1)
     if not noninteractive:
         snapshot_date = datetime.fromisoformat(snapshots[0]['time'])
@@ -224,13 +193,12 @@ def restore(snapshot, target, noninteractive):
             f"THIS COMMAND WILL IRREVERSIBLY OVERWRITES {target}{service_paths.removeprefix('/')}")
         prompt = input("Type YES (uppercase) to continue: ")
         if prompt != 'YES':
-            logger.error("Restore aborted")
+            logging.error("Restore aborted")
             exit(1)
     print(f"Restoring Snapshot {snapshot} of {service_paths} at {target}")
-    # TODO: use tags if no snapshot is selected, to use a snapshot including SERVICE
     result = restic.restore(snapshot_id=snapshot,
                             include=service_paths, target_dir=target)
-    logger.debug(result)
+    logging.debug(result)
 
 
 @cli.command()
@@ -244,9 +212,8 @@ def snapshots():
     if no_snapshots:
         err_msg = "No Snapshots found"
         if SERVICE:
-            service_name = SERVICE.replace('_', '.')
-            err_msg += f' for app {service_name}'
-        logger.warning(err_msg)
+            err_msg += f' for app {SERVICE}'
+        logging.warning(err_msg)
 
 
 @cli.command()
@@ -270,10 +237,10 @@ def list_files(snapshot, path):
         output = restic.internal.command_executor.execute(cmd)
     except ResticFailedError as error:
         if 'no snapshot found' in str(error):
-            err_msg = f'There is no snapshot "{snapshot}"'
+            err_msg = f'There is no snapshot {snapshot}'
             if SERVICE:
-                err_msg += f' for the app "{SERVICE}"'
-            logger.error(err_msg)
+                err_msg += f'for the app {SERVICE}'
+            logging.error(err_msg)
             exit(1)
         else:
             raise error
@@ -285,8 +252,8 @@ def list_files(snapshot, path):
 @cli.command()
 @click.option('snapshot', '--snapshot', '-s', envvar='SNAPSHOT', default='latest')
 @click.option('path', '--path', '-p', envvar='INCLUDE_PATH')
-@click.option('volumes', '--volumes', '-v', envvar='VOLUMES')
-@click.option('secrets', '--secrets', '-c', is_flag=True, envvar='SECRETS')
+@click.option('volumes', '--volumes', '-v', is_flag=True)
+@click.option('secrets', '--secrets', '-c', is_flag=True)
 def download(snapshot, path, volumes, secrets):
     file_dumps = []
     if not any([path, volumes, secrets]):
@@ -304,7 +271,7 @@ def download(snapshot, path, volumes, secrets):
         file_dumps.append((binary_output, tarinfo))
     if volumes:
         if not SERVICE:
-            logger.error("Please specify '--host' when using '--volumes'")
+            logging.error("Please specify '--host' when using '--volumes'")
             exit(1)
         files = list_files(snapshot, VOLUME_PATH)
         for f in files[1:]:
@@ -317,7 +284,7 @@ def download(snapshot, path, volumes, secrets):
                 file_dumps.append((binary_output, tarinfo))
     if secrets:
         if not SERVICE:
-            logger.error("Please specify '--host' when using '--secrets'")
+            logging.error("Please specify '--host' when using '--secrets'")
             exit(1)
         filename = f"{SERVICE}.json"
         files = list_files(snapshot, SECRET_PATH)
@@ -337,8 +304,7 @@ def download(snapshot, path, volumes, secrets):
         for binary_output, tarinfo in file_dumps:
             tar.addfile(tarinfo, fileobj=io.BytesIO(binary_output))
     size = get_formatted_size('/tmp/backup.tar.gz')
-    print(
-        f"Backup has been written to /tmp/backup.tar.gz with a size of {size}")
+    print(f"Backup has been written to /tmp/backup.tar.gz with a size of {size}")
 
 
 def get_formatted_size(file_path):
@@ -359,7 +325,7 @@ def dump(snapshot, path):
     print(f"Dumping {path} from snapshot '{snapshot}'")
     output = subprocess.run(cmd, capture_output=True)
     if output.returncode:
-        logger.error(
+        logging.error(
             f"error while dumping {path} from snapshot '{snapshot}': {output.stderr}")
         exit(1)
     return output.stdout

compose.s3.yml

@@ -0,0 +1,14 @@
+---
+version: "3.8"
+services:
+  app:
+    environment:
+      - AWS_ACCESS_KEY_ID
+      - AWS_SECRET_ACCESS_KEY_FILE=/run/secrets/aws_secret_access_key
+    secrets:
+      - aws_secret_access_key
+
+secrets:
+  aws_secret_access_key:
+    external: true
+    name: ${STACK_NAME}_aws_secret_access_key_${SECRET_AWS_SECRET_ACCESS_KEY_VERSION}

compose.secret.yml

@@ -0,0 +1,13 @@
+---
+version: "3.8"
+services:
+  app:
+    environment:
+      - RESTIC_REPOSITORY_FILE=/run/secrets/restic_repo
+    secrets:
+      - restic_repo
+
+secrets:
+  restic_repo:
+    external: true
+    name: ${STACK_NAME}_restic_repo_${SECRET_RESTIC_REPO_VERSION}

compose.ssh.yml

@@ -0,0 +1,23 @@
+---
+version: "3.8"
+services:
+  app:
+    environment:
+      - SSH_KEY_FILE=/run/secrets/ssh_key
+      - SSH_HOST_KEY
+    secrets:
+      - source: ssh_key
+        mode: 0400
+    configs:
+      - source: ssh_config
+        target: /root/.ssh/config
+
+secrets:
+  ssh_key:
+    external: true
+    name: ${STACK_NAME}_ssh_key_${SECRET_SSH_KEY_VERSION}
+
+configs:
+  ssh_config:
+    name: ${STACK_NAME}_ssh_config_${SSH_CONFIG_VERSION}
+    file: ssh_config

compose.swarm-cronjob.yml

@@ -0,0 +1,15 @@
+---
+version: "3.8"
+services:
+  app:
+    deploy:
+      mode: replicated
+      replicas: 0
+      labels:
+        - "swarm.cronjob.enable=true"
+        # Note(3wc): every 5m, testing
+        - "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

@@ -1,24 +1,28 @@
+---
+version: "3.8"
 services:
   app:
-    image: docker:24.0.7-dind
+    image: git.coopcloud.tech/coop-cloud/backup-bot-two:2.0.0
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
       - "/var/lib/docker/volumes/:/var/lib/docker/volumes/"
       - "/var/lib/docker/containers/:/var/lib/docker/containers/:ro"
+      - backups:/backups
     environment:
       - CRON_SCHEDULE
-      - RESTIC_REPOSITORY_FILE=/run/secrets/restic_repo
+      - RESTIC_REPOSITORY
       - RESTIC_PASSWORD_FILE=/run/secrets/restic_password
     secrets:
-      - restic_repo
       - restic_password
+    deploy:
+      labels:
+        - coop-cloud.${STACK_NAME}.version=0.1.0+latest
+        - coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-300}
+        - coop-cloud.backupbot.enabled=true
     configs:
       - source: entrypoint
         target: /entrypoint.sh
         mode: 0555
-      - source: backupbot
-        target: /usr/bin/backup
-        mode: 0555
     entrypoint: ['/entrypoint.sh']
     healthcheck:
       test: "pgrep crond"
@@ -28,17 +32,14 @@ services:
       start_period: 5m
 
 secrets:
-  restic_repo:
-    external: true
-    name: ${STACK_NAME}_restic_repo
   restic_password:
     external: true
-    name: ${STACK_NAME}_restic_password
+    name: ${STACK_NAME}_restic_password_${SECRET_RESTIC_PASSWORD_VERSION}
+    
+volumes:
+  backups:
 
 configs:
   entrypoint:
-    name: ${STACK_NAME}_entrypoint
+    name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
     file: entrypoint.sh
-  backupbot:
-    name: ${STACK_NAME}_backupbot
-    file: backupbot.py

entrypoint.sh

@@ -2,29 +2,14 @@
 
 set -e -o pipefail
 
-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
-pip install --break-system-packages resticpy==1.0.2
+if [ -n "$SSH_HOST_KEY" ]
+then
+    echo "$SSH_HOST_KEY" > /root/.ssh/known_hosts
+fi
 
 cron_schedule="${CRON_SCHEDULE:?CRON_SCHEDULE not set}"
 
-if [ -n "$PUSH_URL_START" ]
-then
-    push_start_notification="curl -s '$PUSH_URL_START' &&"
-fi
-
-if [ -n "$PUSH_URL_FAIL" ]
-then
-    push_fail_notification="|| curl -s '$PUSH_URL_FAIL'"
-fi
-
-if [ -n "$PUSH_URL_SUCCESS" ]
-then
-    push_notification=" && (grep -q 'backup finished' /tmp/backup.log && curl -s '$PUSH_URL_SUCCESS' $push_fail_notification)"
-fi
-
-echo "$cron_schedule $push_start_notification backup --machine-logs create  2>&1 | tee /tmp/backup.log $push_notification" | crontab -
+echo "$cron_schedule backup create" | crontab -
 crontab -l
 
 crond -f -d8 -L /dev/stdout

release/1.0.0+latest

@@ -0,0 +1,3 @@
+Breaking Change: the variables `SERVER_NAME` and `RESTIC_HOST` are merged into `RESTIC_REPOSITORY`. The format can be looked up here: https://restic.readthedocs.io/en/stable/030_preparing_a_new_repo.html
+ssh/sftp: `sftp:user@host:/repo-path`
+S3:  `s3:https://s3.example.com/bucket_name`

renovate.json

@@ -0,0 +1,3 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
+}

ssh_config

@@ -0,0 +1,4 @@
+Host *
+    IdentityFile    /run/secrets/ssh_key
+    ServerAliveInterval 60
+    ServerAliveCountMax 240