Compare commits

...

20 Commits

Author SHA1 Message Date
marlon 630d08f506 safer backup/restore script 2026-07-01 19:32:40 -04:00
marlon b03cc94e5e chore: publish 2.0.2+2.2.2 release 2026-06-30 20:36:14 -04:00
marlon 9978d84d16 noop 2026-06-30 20:32:25 -04:00
marlon d5af00327f fix config name 2026-06-30 20:29:44 -04:00
marlon 679bcc4ce8 chore: publish 2.0.1+2.2.2 release 2026-06-30 18:21:22 -04:00
marlon 563641ac48 chore: update image tags 2026-06-30 17:32:46 -04:00
joe-irving aaa0711fa4 chore: publish 2.1.0+2.2.0 2026-04-09 15:46:14 +01:00
joe-irving 818ec9bc13 Merge pull request 'chore: publish 2.0.0+2.0.5 release' (#8) from v2.0.0 into main
Reviewed-on: #8
2026-01-05 08:19:04 +00:00
joe-irving af3d655c8f chore: publish 2.0.0+2.0.5 release 2026-01-04 09:09:02 +00:00
marlon 1936226bf5 chore: publish 1.3.0+1.35.3 release 2025-12-10 16:00:00 -05:00
marlon 0865766102 Merge pull request 'backup/restore and merge conflicts' (#7) from linnealovespie/baserow:backup into main
Reviewed-on: #7
2025-12-10 20:49:50 +00:00
linnealovespie 475484928f Merge remote-tracking branch 'cc/backups' into backup 2025-11-24 19:55:38 -08:00
marlon 3158926e7b chore: publish 1.2.2+1.35.3 release 2025-11-10 18:58:27 -05:00
marlon 8ae0634c82 restore test 2025-11-10 18:15:59 -05:00
marlon ca1e0ec1c3 add abra.sh 2025-11-10 16:43:37 -05:00
marlon 14b65c2ecd fix pg scripting vars 2025-11-10 16:40:14 -05:00
marlon c5994bd7e4 backups test 2025-11-10 16:22:33 -05:00
marlon 136ad45cfb rollback 2025-11-10 20:46:35 +00:00
marlon 26e98e915d rollback 2025-11-10 15:42:04 -05:00
marlon aa6b8472f5 rollback restart condition 2025-11-10 15:40:19 -05:00
6 changed files with 56 additions and 4 deletions
+1
View File
@@ -0,0 +1 @@
export PG_BACKUP_CONFIG_VERSION=v1
+33
View File
@@ -0,0 +1,33 @@
if [ "$1" == "pre-backup" ]; then
# Remove any existing db dump and then create a new one
rm -rf $DATA_DIR/postgres/postgres-backup
source /baserow/data/.pgpass
PGPASSWORD=$DATABASE_PASSWORD pg_dump -j 2 -h localhost -U baserow baserow --format=directory -f $DATA_DIR/postgres/postgres-backup
exit
fi
if [ "$1" == "post-backup" ]; then
# rm -rf $DATA_DIR/postgres/postgres-backup
exit
fi
if [ "$1" == "pre-restore" ]; then
pkill -STOP -f "webfrontend"
pkill -STOP -f "celery"
pkill -STOP -f "caddy"
# Disconnect any remaining idle sessions from the 'baserow' database
# This prevents "database is being accessed by other users" errors during pg_restore -c
source /baserow/data/.pgpass
PGPASSWORD=$DATABASE_PASSWORD psql -h localhost -U baserow -d postgres -c "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = 'baserow' AND pid <> pg_backend_pid();"
exit
fi
if [ "$1" == "post-restore" ]; then
source /baserow/data/.pgpass
PGPASSWORD=$DATABASE_PASSWORD pg_restore -j 2 -h localhost -U baserow -d baserow -c $DATA_DIR/postgres/postgres-backup
pkill -CONT -f "webfrontend"
pkill -CONT -f "celery"
pkill -CONT -f "caddy"
exit
fi
+15 -4
View File
@@ -3,7 +3,7 @@ version: "3.8"
services:
app:
image: baserow/baserow:1.35.3
image: baserow/baserow:2.2.2
networks:
- proxy
environment:
@@ -17,7 +17,7 @@ services:
- jwt_key
deploy:
restart_policy:
condition: unless-stopped
condition: on-failure
labels:
- "traefik.enable=true"
- "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
@@ -30,20 +30,31 @@ services:
#- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
- "backupbot.backup=true"
- "backupbot.backup.path=/baserow/data"
- "coop-cloud.${STACK_NAME}.version=1.2.1+1.35.3"
- "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=2.0.2+2.2.2"
healthcheck:
test: ["CMD", "./baserow.sh", "backend-cmd", "backend-healthcheck"]
interval: 30s
timeout: 10s
retries: 10
start_period: 1m
volumes:
- baserow_data:/baserow/data
configs:
- source: backup-postgres
target: /backup.sh
mode: 0777
volumes:
baserow_data:
configs:
backup-postgres:
name: ${STACK_NAME}_backup-postgres_${PG_BACKUP_CONFIG_VERSION}
file: ./backup-postgres.sh
networks:
proxy:
external: true
+1
View File
@@ -0,0 +1 @@
Backup/restore of the postgres database backend will now use pg_dump and pg_restore
+3
View File
@@ -0,0 +1,3 @@
= 1 Breaking Change =
[Builder] Data source now return content with human property names instead of technical ones #4135
+3
View File
@@ -0,0 +1,3 @@
See release notes here ->
https://baserow.io/blog/baserow-2-2-release-notes