backup/restore and merge conflicts #7

Merged
marlon merged 5 commits from linnealovespie/baserow:backup into main 2025-12-10 20:49:50 +00:00

Exactly the same PR as #6, but with the merge conflicts addressed.

RTM tested the updates to this recipe when deploying our own baserow and they appear gtg.

Exactly the same PR as https://git.coopcloud.tech/coop-cloud/baserow/pulls/6, but with the merge conflicts addressed. RTM tested the updates to this recipe when deploying our own baserow and they appear gtg.
linnealovespie added 5 commits 2025-11-25 03:57:43 +00:00
ammaratef45 reviewed 2025-11-25 06:58:17 +00:00
ammaratef45 left a comment
Owner

lgtm, just had that one comment + a general (for the record) question, how was that tested?

lgtm, just had that one comment + a general (for the record) question, how was that tested?
@ -34,0 +33,4 @@
- "backupbot.backup.pre-hook=/backup.sh pre-backup"
- "backupbot.backup.post-hook=/backup.sh post-backup"
- "backupbot.restore.post-hook=/backup.sh post-restore"
- "coop-cloud.${STACK_NAME}.version=1.2.0+1.35.3"
Owner

Did the version decrease on purpose or a merge conflict?

Did the version decrease on purpose or a merge conflict?
marlon merged commit 0865766102 into main 2025-12-10 20:49:50 +00:00
Owner

Thank you @linnealovespie for working this out, I had meant to merge this a while ago and forgot. Glad to see someone else is paying attention :)

@ammaratef45 not sure if this is what you're asking but I tested this feature manually by making a snapshot using backup-bot-two, changing data in baserow, and then running a restore.

Thank you @linnealovespie for working this out, I had meant to merge this a while ago and forgot. Glad to see someone else is paying attention :) @ammaratef45 not sure if this is what you're asking but I tested this feature manually by making a snapshot using backup-bot-two, changing data in baserow, and then running a restore.
Sign in to join this conversation.
No description provided.