coop-cloud/baserow
1
1
Fork 3
Code Issues 3 Pull Requests 2 Packages Projects Releases Wiki Activity

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
Conversation 2 Commits 5 Files Changed 3
+37 -3
linnealovespie commented 2025-11-25 03:57:38 +00:00
Owner
Copy Link
Copy Source

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
backups test c5994bd7e4
fix pg scripting vars 14b65c2ecd
add abra.sh ca1e0ec1c3
restore test 8ae0634c82
Merge remote-tracking branch 'cc/backups' into backup 475484928f
ammaratef45 reviewed 2025-11-25 06:58:17 +00:00
ammaratef45 left a comment
Owner
Copy Link
Copy Source

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?
compose.yml
@@ -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"
ammaratef45 commented 2025-11-25 06:57:00 +00:00
Owner
Copy Link
Copy Source

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
marlon commented 2025-12-10 21:14:41 +00:00
Owner
Copy Link
Copy Source

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.
👍 1
Sign in to join this conversation.
Reviewers
No Reviewers
ammaratef45
Labels
No items
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
3wordchant aadil (Aadil Ayub) abra-bot (Abra Bot) ammaratef45 amras (Sarma) Apfelwurm appletalk arjan basebuilder BornDeleuze Brooke carla cas (Cassowary) codegod100 coopcloud cyrnel decentral1se (d1) dede devydave fauno (fauno) flancian Frando iexos jade (Jade Ambrose) javielico (Javielico) jjsfunhouse jmakdah2 (Jackie Makdah) joe-irving (Joe Irving) kawaiipunk (KawaiiPunk) knoflook kolaente lambdabundesverband linnealovespie (April) marlon (marlon) mayel mirsal moosemower moritz nicksellen (Nick Sellen) notplants oxaliq (sorrel) p4u1 pau pharaohgraphy (Andrew 🐦‍🔥❤️‍🔥✴️) PhiNatalie renovate-bot (Comrade Renovate Bot) ripclap rix rscmbbng sef (sef) simon sixsmith (Sixsmith) stevensting tobias trav (Trav Fryer) val (val (he/him)) vaznasty virtualboys wolcen (Chris Thompson) wykwit xynosis yksflip
No Assignees
3 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: coop-cloud/baserow#7