Compare commits

..

9 Commits

Author SHA1 Message Date
linnealovespie a866918e92 add backup labels 2025-11-03 19:26:40 -08:00
linnealovespie 26cd26d509 uncomment 2025-10-30 20:15:49 -07:00
linnealovespie 25ed229656 uncomment 2025-10-30 20:14:57 -07:00
linnealovespie d17155f799 update secret version 2025-10-30 20:13:24 -07:00
linnealovespie 68bfb287e1 try to add db service 2025-10-30 19:49:29 -07:00
marlon e85291cdb6 chore: publish 1.2.0+1.35.3 release 2025-10-22 10:50:26 -04:00
marlon e61e4d9e13 add backup support 2025-10-22 10:46:40 -04:00
marlon 43c7fb2130 chore: publish 1.1.0+1.31.1 release 2025-07-17 13:49:00 -04:00
marlon 48f7153a9b Merge pull request 'add config options for running with low resources' (#4) from low-resource into main
Reviewed-on: #4
2025-07-17 17:44:57 +00:00
4 changed files with 86 additions and 3 deletions
+1
View File
@@ -28,4 +28,5 @@ LETS_ENCRYPT_ENV=production
SECRET_SECRET_KEY_VERSION=v1
SECRET_JWT_KEY_VERSION=v1
SECRET_DB_PASSWORD_VERSION=v1
+1
View File
@@ -0,0 +1 @@
export PG_BACKUP_VERSION=v1
+50 -3
View File
@@ -3,18 +3,26 @@ version: "3.8"
services:
app:
image: baserow/baserow:1.31.1
image: baserow/baserow:1.35.3
depends_on:
- db
networks:
- proxy
- internal
environment:
- BASEROW_PUBLIC_URL=https://${DOMAIN}
- SECRET_KEY_FILE=/run/secrets/secret_key
- BASEROW_JWT_SIGNING_KEY_FILE=/run/secrets/jwt_key
- BASEROW_CADDY_ADDRESSES=:80
- BASEROW_BUILDER_DOMAINS=${WILDCARD_DOMAIN}
- DATABASE_HOST=db
- DATABASE_NAME=postgres
- DATABASE_USER=postgres
- DATABASE_PASSWORD_FILE=/run/secrets/db_password
secrets:
- secret_key
- jwt_key
- db_password
deploy:
restart_policy:
condition: on-failure
@@ -28,23 +36,54 @@ services:
#- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
#- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
#- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
- "coop-cloud.${STACK_NAME}.version=1.0.0+1.31.1"
- "backupbot.backup=true"
- "backupbot.backup.path=/baserow/data"
- "coop-cloud.${STACK_NAME}.version=1.2.0+1.35.3"
healthcheck:
test: ["CMD", "./baserow.sh", "backend-cmd", "backend-healthcheck"]
interval: 30s
timeout: 10s
retries: 10
start_period: 1m
volumes:
- baserow_data:/baserow/data
db:
image: postgres:15
volumes:
- postgres_data:/var/lib/postgresql/data
environment:
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD_FILE=/run/secrets/db_password
- POSTGRES_DB=postgres
networks:
internal:
deploy:
restart_policy:
condition: on-failure
labels:
backupbot.backup.pre-hook: "/pg_backup.sh backup"
backupbot.backup.volumes.postgres.path: "backup.sql"
backupbot.restore.post-hook: '/pg_backup.sh restore'
configs:
- source: pg_backup
target: /pg_backup.sh
mode: 0555
secrets:
- db_password
healthcheck:
test: ["CMD-SHELL", "pg_isready", "-U", "postgres"]
interval: 30s
timeout: 10s
retries: 10
volumes:
baserow_data:
postgres_data:
networks:
proxy:
external: true
internal:
secrets:
secret_key:
@@ -53,3 +92,11 @@ secrets:
jwt_key:
external: true
name: ${STACK_NAME}_jwt_key_${SECRET_JWT_KEY_VERSION}
db_password:
external: true
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
configs:
pg_backup:
name: ${STACK_NAME}_pg_backup_${PG_BACKUP_VERSION}
file: pg_backup.sh
+34
View File
@@ -0,0 +1,34 @@
#!/bin/bash
set -e
BACKUP_FILE='/var/lib/postgresql/data/backup.sql'
function backup {
export PGPASSWORD=$(cat /run/secrets/db_password)
pg_dump -U ${POSTGRES_USER} ${POSTGRES_DB} > $BACKUP_FILE
}
function restore {
cd /var/lib/postgresql/data/
restore_config(){
# Restore allowed connections
cat pg_hba.conf.bak > pg_hba.conf
su postgres -c 'pg_ctl reload'
}
# Don't allow any other connections than local
cp pg_hba.conf pg_hba.conf.bak
echo "local all all trust" > pg_hba.conf
su postgres -c 'pg_ctl reload'
trap restore_config EXIT INT TERM
# Recreate Database
psql -U ${POSTGRES_USER} -d postgres -c "DROP DATABASE ${POSTGRES_DB} WITH (FORCE);"
createdb -U ${POSTGRES_USER} ${POSTGRES_DB}
psql -U ${POSTGRES_USER} -d ${POSTGRES_DB} -1 -f $BACKUP_FILE
trap - EXIT INT TERM
restore_config
}
$@