Merge pull request 'chore(deps): update baserow/baserow docker tag to v2.3.3' (#13) from renovate/baserow-baserow-2.x into main

Reviewed-on: #13

abra.sh

@@ -1,2 +1 @@
-export PG_BACKUP_CONFIG_VERSION=v1
-export ENTRYPOINT_VERSION=v1
+export PG_BACKUP_CONFIG_VERSION=v2

backup-postgres.sh

@@ -2,21 +2,32 @@ 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
+  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
+#  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 8 -h localhost -U baserow -d baserow -c $DATA_DIR/postgres/postgres-backup
+  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

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: baserow/baserow:2.0.5
+    image: baserow/baserow:2.3.3
     networks:
       - proxy
     environment:
@@ -17,7 +17,7 @@ services:
       - jwt_key
     deploy:
       restart_policy:
-        condition: none
+        condition: on-failure
       labels:
         - "traefik.enable=true"
         - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
@@ -33,35 +33,27 @@ services:
         - "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
+        - "coop-cloud.${STACK_NAME}.version=2.3.3+2.3.3"
+    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
+        mode: 0777      
       
 volumes:
   baserow_data:
 
 configs:
   backup-postgres:
-    name: backup-postgres_${PG_BACKUP_CONFIG_VERSION}
+    name: ${STACK_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:

entrypoint.sh.tmpl

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-/baserow.sh start
-
-
-tail -f /dev/null

release/2.1.0+2.2.0

@@ -0,0 +1,3 @@
+See release notes here ->
+
+https://baserow.io/blog/baserow-2-2-release-notes

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}