Merged main and master

.drone.yml

@@ -6,7 +6,7 @@ steps:
     image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
     settings:
       host: swarm-test.autonomic.zone
-      stack: {{ .Name }}
+      stack: baserow
       generate_secrets: true
       purge: true
       deploy_key:
@@ -14,8 +14,8 @@ steps:
       networks:
         - proxy
     environment:
-      DOMAIN: {{ .Name }}.swarm-test.autonomic.zone
-      STACK_NAME: {{ .Name }}
+      DOMAIN: baserow.swarm-test.autonomic.zone
+      STACK_NAME: baserow
       LETS_ENCRYPT_ENV: production
 trigger:
   branch:

.env.sample

@@ -2,7 +2,22 @@ TYPE=baserow
 
 DOMAIN=baserow.example.com
 
+COMPOSE_FILE="compose.yml"
+
 ## Domain aliases
 #EXTRA_DOMAINS=', `www.baserow.example.com`'
 
 LETS_ENCRYPT_ENV=production
+
+# 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_BASEROW_JWT_SIGNING_KEY_VERSION=v1
+

README.md

@@ -1,6 +1,6 @@
 # baserow
 
-> One line description of the recipe
+> Minimum Viable deploy of Baserow: Open source no-code database and Airtable alternative
 
 <!-- metadata -->
 

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

@@ -8,6 +8,11 @@ services:
       - proxy
     environment:
       - BASEROW_PUBLIC_URL=https://${DOMAIN}
+      - SECRET_KEY_FILE=/run/secrets/secret_key
+      - BASEROW_JWT_SIGNING_KEY_FILE=/run/secrets/baserow_jwt_signing_key
+    secrets:
+      - secret_key
+      - baserow_jwt_signing_key
     deploy:
       restart_policy:
         condition: on-failure
@@ -21,7 +26,7 @@ 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=0.1.0+1.21.2"
+        - "coop-cloud.${STACK_NAME}.version=0.1.2+1.21.2"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost"]
       interval: 30s
@@ -38,3 +43,11 @@ volumes:
 networks:
   proxy:
     external: true
+
+secrets:
+  secret_key:
+    external: true
+    name: ${STACK_NAME}_secret_key_${SECRET_SECRET_KEY_VERSION}
+  baserow_jwt_signing_key:
+    external: true
+    name: ${STACK_NAME}_baserow_jwt_signing_key_${SECRET_BASEROW_JWT_SIGNING_KEY_VERSION}