Compare commits

..

9 Commits

Author SHA1 Message Date
marlon b774704518 troubleshoot changes 2026-07-01 18:28:14 -04: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 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
6 changed files with 66 additions and 11 deletions
+2
View File
@@ -0,0 +1,2 @@
export PG_BACKUP_CONFIG_VERSION=v1
export ENTRYPOINT_VERSION=v1
+22
View File
@@ -0,0 +1,22 @@
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 8 -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
exit
fi
if [ "$1" == "post-restore" ]; then
source /baserow/data/.pgpass
PGPASSWORD=$DATABASE_PASSWORD pg_restore -j 8 -h localhost -U baserow -d baserow -c $DATA_DIR/postgres/postgres-backup
exit
fi
+30 -11
View File
@@ -3,7 +3,7 @@ version: "3.8"
services:
app:
image: baserow/baserow:1.35.3
image: baserow/baserow:2.0.5
networks:
- proxy
environment:
@@ -17,7 +17,7 @@ services:
- jwt_key
deploy:
restart_policy:
condition: on-failure
condition: none
labels:
- "traefik.enable=true"
- "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
@@ -30,20 +30,39 @@ 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.2+1.35.3"
healthcheck:
test: ["CMD", "./baserow.sh", "backend-cmd", "backend-healthcheck"]
interval: 30s
timeout: 10s
retries: 10
start_period: 1m
- "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.0+2.0.5"
# 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
- source: entrypoint
target: /custom-entrypoint.sh
mode: 555
entrypoint: /custom-entrypoint.sh
volumes:
baserow_data:
configs:
backup-postgres:
name: backup-postgres_${PG_BACKUP_CONFIG_VERSION}
file: ./backup-postgres.sh
entrypoint:
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
file: entrypoint.sh.tmpl
template_driver: golang
networks:
proxy:
external: true
+8
View File
@@ -0,0 +1,8 @@
#!/bin/bash
set -eu
/baserow.sh start
tail -f /dev/null
+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