Merge branch 'main' into backups

Reviewed-on: #1

.drone.yml

@@ -34,7 +34,7 @@ steps:
         from_secret: drone_abra-bot_token
       fork: true
       repositories:
-        - coop-cloud/auto-recipes-catalogue-json
+        - toolshed/auto-recipes-catalogue-json
 
 trigger:
   event: tag

.env.sample

@@ -1,6 +1,6 @@
 TYPE=nocodb
 
-DOMAIN={{ .Domain }}
+DOMAIN=nocodb.example.com
 
 ## Domain aliases
 #EXTRA_DOMAINS=', `www.nocodb.example.com`'
@@ -9,3 +9,4 @@ LETS_ENCRYPT_ENV=production
 
 SECRET_DB_PASSWORD_VERSION=v1
 SECRET_NC_DB_URL_VERSION=v1
+ENABLE_BACKUPS=true

README.md

@@ -8,7 +8,7 @@
 * **Status**: 0
 * **Image**: [`nocodb`](https://hub.docker.com/r/nocodb), 4, upstream
 * **Healthcheck**: No
-* **Backups**: No
+* **Backups**: Yes
 * **Email**: No
 * **Tests**: No
 * **SSO**: No

abra.sh

@@ -0,0 +1 @@
+export PG_BACKUP_VERSION=v1

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: nocodb/nocodb:0.255.2
+    image: nocodb/nocodb:0.263.1
     secrets:
       - nc_db_url
     networks:
@@ -28,7 +28,8 @@ 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+0.255.2"
+        - "backupbot.backup=${ENABLE_BACKUPS:-true}"
+        - "coop-cloud.${STACK_NAME}.version=1.1.1+0.263.0"
 
   db:
     image: postgres:13.2-alpine
@@ -43,10 +44,20 @@ services:
     volumes:
       - db:/var/lib/postgresql/data
     healthcheck:
-      test: pg_isready -U ${DATABASE_USER} -d ${DATABASE_NAME}
+      test: pg_isready -U nocodb -d nocodb
       interval: 10s
       timeout: 2s
       retries: 10
+    deploy:
+      labels:
+        backupbot.backup: "${ENABLE_BACKUPS:-true}"
+        backupbot.backup.pre-hook: "/pg_backup.sh backup"
+        backupbot.backup.volumes.db.path: "backup.sql"
+        backupbot.restore.post-hook: '/pg_backup.sh restore'
+    configs:
+        - source: pg_backup
+          target: /pg_backup.sh
+          mode: 0555
 
 volumes:
   data:
@@ -65,3 +76,7 @@ secrets:
   nc_db_url:
     external: true
     name: ${STACK_NAME}_nc_db_url_${SECRET_NC_DB_URL_VERSION}
+configs:
+  pg_backup:
+    name: ${STACK_NAME}_pg_backup_${PG_BACKUP_VERSION}
+    file: pg_backup.sh

pg_backup.sh

@@ -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
+}
+
+$@