From 2d45c2fdebfd120de5918f1d4ec3840fb3ffbf4a Mon Sep 17 00:00:00 2001 From: Cassowary Date: Mon, 25 Dec 2023 12:27:43 -0800 Subject: [PATCH 1/5] chore: publish 0.1.0+1.21.2 release --- README.md | 3 ++- compose.yml | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6ad9df2..a4f2e6b 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,9 @@ ## Quick start -* `abra app new baserow --secrets` +* `abra app new baserow` * `abra app config ` * `abra app deploy ` For more, see [`docs.coopcloud.tech`](https://docs.coopcloud.tech). + diff --git a/compose.yml b/compose.yml index a2c3805..a98a341 100644 --- a/compose.yml +++ b/compose.yml @@ -3,9 +3,11 @@ version: "3.8" services: app: - image: nginx:1.20.0 + image: baserow/baserow:1.21.2 networks: - proxy + environment: + - BASEROW_PUBLIC_URL=https://${DOMAIN} deploy: restart_policy: condition: on-failure @@ -19,7 +21,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=" + - "coop-cloud.${STACK_NAME}.version=0.1.0+1.21.2" healthcheck: test: ["CMD", "curl", "-f", "http://localhost"] interval: 30s @@ -27,6 +29,12 @@ services: retries: 10 start_period: 1m + volumes: + - baserow_data:/baserow/data + +volumes: + baserow_data: + networks: proxy: external: true From 794d918417ad3ee70a8b807577004e2f43c73a16 Mon Sep 17 00:00:00 2001 From: Cassowary Date: Mon, 25 Dec 2023 12:37:41 -0800 Subject: [PATCH 2/5] chore: publish 0.1.1+1.21.2 release --- .drone.yml | 6 +++--- compose.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3587265..26c6d63 100644 --- a/.drone.yml +++ b/.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: diff --git a/compose.yml b/compose.yml index a98a341..e69914a 100644 --- a/compose.yml +++ b/compose.yml @@ -21,7 +21,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.1+1.21.2" healthcheck: test: ["CMD", "curl", "-f", "http://localhost"] interval: 30s From e8486625dfd497ad57e5dc1f0055b616c1a567c5 Mon Sep 17 00:00:00 2001 From: Cassowary Date: Mon, 25 Dec 2023 12:41:12 -0800 Subject: [PATCH 3/5] chore: publish 0.1.2+1.21.2 release --- README.md | 2 +- compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a4f2e6b..301ebb9 100644 --- a/README.md +++ b/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 diff --git a/compose.yml b/compose.yml index e69914a..6ba3e65 100644 --- a/compose.yml +++ b/compose.yml @@ -21,7 +21,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.1+1.21.2" + - "coop-cloud.${STACK_NAME}.version=0.1.2+1.21.2" healthcheck: test: ["CMD", "curl", "-f", "http://localhost"] interval: 30s From da39891d71ee211711279a317c5473d075ffad6e Mon Sep 17 00:00:00 2001 From: Cassowary Date: Fri, 22 Mar 2024 16:55:14 -0700 Subject: [PATCH 4/5] Add secrets and email support --- .env.sample | 14 ++++++++++++++ compose.email.yml | 21 +++++++++++++++++++++ compose.yml | 13 +++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 compose.email.yml diff --git a/.env.sample b/.env.sample index 3f0e2bf..167a42d 100644 --- a/.env.sample +++ b/.env.sample @@ -6,3 +6,17 @@ DOMAIN=baserow.example.com #EXTRA_DOMAINS=', `www.baserow.example.com`' LETS_ENCRYPT_ENV=production + + +# COMPOSE_FILE="$COMPOSE_FILE:compose.email.yml" +# FROM_EMAIL="No Reply " +# 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 + diff --git a/compose.email.yml b/compose.email.yml new file mode 100644 index 0000000..a0fb5ed --- /dev/null +++ b/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} + diff --git a/compose.yml b/compose.yml index 6ba3e65..9c705bf 100644 --- a/compose.yml +++ b/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 @@ -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} From 63b2fda7d351a935d0ad28f33387ed69fb350c02 Mon Sep 17 00:00:00 2001 From: Cassowary Date: Fri, 22 Mar 2024 17:53:29 -0700 Subject: [PATCH 5/5] Fix extra compose woops --- .env.sample | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.env.sample b/.env.sample index 167a42d..eeee31f 100644 --- a/.env.sample +++ b/.env.sample @@ -2,12 +2,13 @@ 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 " # EMAIL_SMTP_USE_TLS=true