diff --git a/README.md b/README.md index bd3e16944f4290785ebd98076d354546f03b305b..7ad3ed061987090488596066e2e221c5d9e99024 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 e3dfdb911c22648532bcdac8cfc80cdc271780c6..6e8a0abbde68978108de4866f51b7cf44012f375 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}" "$@" ;; *)