From 683f01f7055864a0b3c3bce7b4d23469281ecd00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radoslav=20Bod=C3=B3?= <bodik@cesnet.cz>
Date: Tue, 16 Apr 2024 21:56:04 +0200
Subject: [PATCH] general: readme cleanup, docker helper tuning
---
README.md | 4 +++-
scripts/docker.sh | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index bd3e169..7ad3ed0 100644
--- a/README.md
+++ b/README.md
@@ -145,6 +145,8 @@ rwm restic mount /mnt/restore
* Executed tools stdout is buffered, eg. `restic mount` does not print immediate output as normal.
* Passthrough full arguments to underlying tool with "--" (eg. `rwm aws -- s3api --help`).
+* When running backup from container, container hostname must be fixed for restic to find
+ parent backup properly
* TODO: elaborate and hardcode default retention (?restic keeps are tricky).
* TODO: microceph in CI runner break sometimes, reinstall microceph and reboot to salvage it.
@@ -173,7 +175,7 @@ rwm restic mount /mnt/restore
6. Perform backups using the designated resource identities
(`project_backedresource1` and `project_backedresource2`).
-7. Employ the project_admin identity to execute maintenance tasks as necessary.
+7. Employ the `project_admin` identity to execute maintenance tasks as necessary.
## Development
diff --git a/scripts/docker.sh b/scripts/docker.sh
index e3dfdb9..6e8a0ab 100755
--- a/scripts/docker.sh
+++ b/scripts/docker.sh
@@ -29,7 +29,7 @@ case "$1" in
run)
shift
- docker run --rm -v "$(pwd)/rwm.conf:/opt/rwm/rwm.conf" -it "${REGISTRY_URL}/${IMAGE_NAME}:${BRANCH}" "$@"
+ docker run --rm -h "$(hostname)" -v "$(pwd)/rwm.conf:/opt/rwm/rwm.conf" -it "${REGISTRY_URL}/${IMAGE_NAME}:${BRANCH}" "$@"
;;
*)
--
GitLab