From 9fcd107db82950fdc86ef235b9ba9c63ad0fc0af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Fernandes?= Date: Sun, 21 Sep 2025 19:12:35 +0100 Subject: [PATCH] . --- README.md | 42 ++++++++++++++++++----------------------- docker-compose.dev.yaml | 4 ++-- 2 files changed, 20 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 5d77991..5938933 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ - [container image](#container-image) - [environment variables](#environment-variables) - - [borg repo init](#borg-repo-init) + - [borg init repo](#borg-init-repo) - [creating a backup](#creating-a-backup) - [using a bash script](#using-a-bash-script) - [dev](#dev) @@ -15,40 +15,34 @@ -### borg repo init +### borg init repo ```bash services: borg-backup: image: git.limbosolutions.com/kb/borg-backup:latest restart: no - tty: true - environment: - - BORG_REPO: ssh://user@server/home/user/borg-repo - - BORG_RSH: "-o StrictHostKeyChecking=no -o LogLevel=ERROR" + - BORG_REPO=${BORG_REPO} + - BORG_RSH=${BORG_RSH} + - BORG_PASSPHRASE="${BORG_PASSPHRASE}" + - MODE=SCRIPT # Valid modes are: BORG, SCRIPT, SHELL, default is BORG configs: - - source: id_ed25519 # required for ssh client - target: /root/.ssh/id_ed25519 - - source: borg_init_repo_sh - target: /init-repo + + - source: id_ed25519 + target: /root/.ssh/id_ed25519 + mode: 0400 + + command: + - | + borg init --encryption=keyfile-blake2 $BORG_REPO + cat /root/.config/borg/keys/* configs: - borg_init_repo_sh: - # Example, execute - # borg init --encryption=keyfile-blake2 $BORG_REPO - # don't forget to copy key file content on borg folder (/root/.borg/keys/*) and BORG_PASSPHRASE used during initialization - content: - while true; do - sleep 5 - done id_ed25519: - content: | - -----BEGIN OPENSSH PRIVATE KEY----- - ************** - ************** - -----END OPENSSH PRIVATE KEY----- + file: ~/.ssh/id_ed25519 + ``` ### creating a backup @@ -182,7 +176,7 @@ For development environment and testing this docker compose files. BUILD="" # uncomment do force build -#BUILD="--build" +BUILD="--build" if [ ! -f ./docker-compose.dev.local.yaml ]; then touch ./docker-compose.dev.local.yaml diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml index 1e60d2d..4f7f74d 100644 --- a/docker-compose.dev.yaml +++ b/docker-compose.dev.yaml @@ -8,8 +8,8 @@ services: context: . environment: - - BORG_REPO="${BORG_REPO}" - - BORG_RSH="${BORG_RSH}" + - BORG_REPO=${BORG_REPO} + - BORG_RSH=${BORG_RSH} - BORG_PASSPHRASE="${BORG_PASSPHRASE}" - MODE=SCRIPT # Valid modes are: BORG, SCRIPT, SHELL, default is BORG configs: