restore test

Reviewed-on: #4

.drone.yml

@@ -32,7 +32,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

@@ -2,7 +2,30 @@ TYPE=baserow
 
 DOMAIN=baserow.example.com
 
+COMPOSE_FILE="compose.yml"
+
 ## Domain aliases
 #EXTRA_DOMAINS=', `www.baserow.example.com`'
 
+## Automatically use subdomains under following domain (anything.example.com)
+#WILDCARD_DOMAIN='example.com'
+
 LETS_ENCRYPT_ENV=production
+
+## For low-resource machines (<2GB ram)
+# BASEROW_AMOUNT_OF_GUNICORN_WORKERS=1
+# BASEROW_AMOUNT_OF_WORKERS=1
+# BASEROW_RUN_MINIMAL=yes
+
+# COMPOSE_FILE="$COMPOSE_FILE:compose.email.yml"
+# FROM_EMAIL="No Reply <noreply@example.com>"
+# EMAIL_SMTP_USE_TLS=true
+# EMAIL_SMTP_HOST=mail.exampl.com
+# EMAIL_SMTP_PORT=497
+# EMAIL_SMTP_USER=noreply@example.com
+# SECRET_EMAIL_SMTP_PASSWORD_VERSION=v1
+#
+
+SECRET_SECRET_KEY_VERSION=v1
+SECRET_JWT_KEY_VERSION=v1
+

README.md

@@ -7,7 +7,7 @@
 * **Category**: Apps
 * **Status**: 0
 * **Image**: [`baserow`](https://hub.docker.com/r/baserow), 4, upstream
-* **Healthcheck**: No
+* **Healthcheck**: Yes (using https://baserow.io/docs/installation%2Finstall-with-docker#running-healthchecks-on-baserow)
 * **Backups**: No
 * **Email**: No
 * **Tests**: No
@@ -21,5 +21,11 @@
 * `abra app config <app-name>`
 * `abra app deploy <app-name>`
 
+## Resources
+
+* Baserow requires over 2GB RAM to run on Co-op Cloud with default settings
+* For environments with 2GB or less RAM, run `abra app config <app-name>` and uncomment the `For low-resource machines` config block
+* More info: https://hub.docker.com/r/baserow/baserow/#scaling-options
+
 For more, see [`docs.coopcloud.tech`](https://docs.coopcloud.tech).
 

abra.sh

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

backup-postgres.sh

@@ -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

compose.email.yml

@@ -0,0 +1,21 @@
+---
+version: "3.8"
+
+services:
+  app:
+    environment:
+      - EMAIL_SMTP=true
+      - EMAIL_SMTP_PASSWORD_FILE=/run/secrets/email_smtp_password
+      - FROM_EMAIL
+      - EMAIL_SMTP_USE_TLS
+      - EMAIL_SMTP_HOST
+      - EMAIL_SMTP_PORT
+      - EMAIL_SMTP_USER
+    secrets:
+      - email_smtp_password
+
+secrets:
+  email_smtp_password:
+    external: true
+    name: ${STACK_NAME}_email_smtp_password_${SECRET_EMAIL_SMTP_PASSWORD_VERSION}
+      

compose.yml

@@ -3,38 +3,66 @@ version: "3.8"
 
 services:
   app:
-    image: baserow/baserow:1.21.2
+    image: baserow/baserow:1.35.3
     networks:
       - proxy
     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}
+    secrets:
+      - secret_key
+      - jwt_key
     deploy:
       restart_policy:
         condition: on-failure
       labels:
         - "traefik.enable=true"
         - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
-        - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
+        - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS}) || HostRegexp(`{subdomain:\\w+}.${WILDCARD_DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
         ## Redirect from EXTRA_DOMAINS to DOMAIN
         #- "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=0.1.2+1.21.2"
+        - "backupbot.backup=true"
+        - "backupbot.backup.path=/baserow/data"
+        - "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=1.2.0+1.35.3"
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost"]
+      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: backup-postgres_${PG_BACKUP_CONFIG_VERSION}
+    file: ./backup-postgres.sh
+
 networks:
   proxy:
     external: true
+
+secrets:
+  secret_key:
+    external: true
+    name: ${STACK_NAME}_secret_key_${SECRET_SECRET_KEY_VERSION}
+  jwt_key:
+    external: true
+    name: ${STACK_NAME}_jwt_key_${SECRET_JWT_KEY_VERSION}

release/0.2.0+1.21.2

@@ -0,0 +1 @@
+Fix compose file

release/0.3.0+1.25.2

@@ -0,0 +1 @@
+WARNING: this version includes a major Postgres upgrade, you need to follow the steps here, ideally BEFORE upgrading: https://baserow.io/docs/installation%2Finstall-with-docker#upgrade-process

release/1.0.0+1.31.1

@@ -0,0 +1,7 @@
+This upgrade changes the name of the jwt signing key secret from baserow_jwt_signing_key to jwt_key
+EXISTING DEPLOYMENTS MUST COPY THIS SECRET TO THE NEW LOCATION:
+# Retrieve the current jwt key value:
+docker exec <your_baserow_container_name> cat /run/secrets/baserow_jwt_signing_key
+# Create the new secret
+abra app secret insert <your_baserow_domain> jwt_key v1 <value returned by previous command>
+