Define $COMPOSE_FILE in config to fix abra app deploy error

By default, the config options provided in the template fail because $COMPOSE_FILE is not set, leading to an error `[abra recipe path] is a directory` when running `abra app deploy`. This is fixed by setting `$COMPOSE_FILE` to `compose.yml`

.drone.yml

@@ -0,0 +1,40 @@
+---
+kind: pipeline
+name: deploy to swarm-test.autonomic.zone
+steps:
+  - name: deployment
+    image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
+    settings:
+      host: swarm-test.autonomic.zone
+      stack: vaultwarden
+      generate_secrets: true
+      purge: true
+      deploy_key:
+        from_secret: drone_ssh_swarm_test
+      networks:
+        - proxy
+    environment:
+      DOMAIN: vaultwarden.swarm-test.autonomic.zone
+      STACK_NAME: vaultwarden
+      LETS_ENCRYPT_ENV: production
+      APP_ENTRYPOINT_VERSION: v1
+      SECRET_ADMIN_TOKEN_VERSION: v1
+trigger:
+  branch:
+    - main
+---
+kind: pipeline
+name: generate recipe catalogue
+steps:
+  - name: release a new version
+    image: plugins/downstream
+    settings:
+      server: https://build.coopcloud.tech
+      token:
+        from_secret: drone_abra-bot_token
+      fork: true
+      repositories:
+        - coop-cloud/auto-recipes-catalogue-json
+
+trigger:
+  event: tag

.env.sample

@@ -3,6 +3,8 @@ TYPE=vaultwarden
 DOMAIN=vaultwarden.example.com
 LETS_ENCRYPT_ENV=production
 
+COMPOSE_FILE="compose.yml"
+
 WEBSOCKET_ENABLED=true
 SIGNUPS_ALLOWED=true
 
@@ -12,3 +14,13 @@ LOG_FILE=/data/vaultwarden.log
 LOG_LEVEL=warn
 
 SECRET_ADMIN_TOKEN_VERSION=v1 # length=48
+
+
+## SMTP settings
+#COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
+#SECRET_SMTP_PASSWORD_VERSION=v1
+#SMTP_FROM=noreply@example.com
+#SMTP_USERNAME=noreply@example.com
+#SMTP_HOST=mail.example.com
+#SMTP_PORT=587
+#SMTP_SECURITY=starttls

README.md

@@ -20,8 +20,8 @@
 1. Set up Docker Swarm and [`abra`]
 2. Deploy [`coop-cloud/traefik`]
 3. `abra app new vaultwarden`
-4. `abra app YOURAPPDOMAIN config`
-5. `abra app YOURAPPDOMAIN deploy`
+4. `abra app config YOURAPPDOMAIN`
+5. `abra app deploy YOURAPPDOMAIN`
 
 [`abra`]: https://git.coopcloud.tech/coop-cloud/abra
 [`coop-cloud/traefik`]: https://git.coopcloud.tech/coop-cloud/traefik

abra.sh

@@ -1 +1,28 @@
-export APP_ENTRYPOINT_VERSION=v1
+export APP_ENTRYPOINT_VERSION=v2
+APP_DIR="app:/data"
+
+_backup_app() {
+  # Copied _abra_backup_dir to make UX better on restore and backup
+  {
+    abra__src_="$1"
+    abra__dst_="-"
+  }
+
+  # shellcheck disable=SC2154
+  FILENAME="$(basename "$1").tar"
+
+  debug "Copying '$1' to '$FILENAME'"
+
+  silence
+  mkdir -p /tmp/abra
+  sub_app_cp > /tmp/abra/$FILENAME
+  unsilence
+}
+
+abra_backup_app() {
+  # shellcheck disable=SC2154
+  ARK_FILENAME="$ABRA_BACKUP_DIR/${abra__app_}_app_$(date +%F).tar.gz"
+  # Cant be FILENAME as that gets changed by something
+  _backup_app $APP_DIR
+  success "Backed up 'app' to $ARK_FILENAME"
+}

compose.smtp.yml

@@ -0,0 +1,19 @@
+---
+version: "3.8"
+
+services:
+  app:
+    secrets:
+      - smtp_password
+    environment:
+      - "SMTP_PASSWORD_FILE=/run/secrets/smtp_password"
+      - "SMTP_FROM"
+      - "SMTP_USERNAME"
+      - "SMTP_HOST"
+      - "SMTP_PORT"
+      - "SMTP_SECURITY"
+
+secrets:
+  smtp_password:
+    external: true
+    name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: vaultwarden/server:1.26.0
+    image: vaultwarden/server:1.32.0
     networks:
       - proxy
     environment:
@@ -39,7 +39,9 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - "coop-cloud.${STACK_NAME}.version=0.2.0+1.26.0"
+        - "coop-cloud.${STACK_NAME}.version=0.9.0+1.32.0"
+        - "backupbot.backup=true"
+        - "backupbot.backup.path=/data"
 
 volumes:
   vaultwarden_data:

entrypoint.sh.tmpl

@@ -25,6 +25,7 @@ file_env() {
 }
 
 file_env "ADMIN_TOKEN"
+file_env "SMTP_PASSWORD"
 
 # upstream startup command
 # https://github.com/dani-garcia/vaultwarden/blob/60ed5ff99d15dec0b82c85987f9a3e244b8bde91/docker/Dockerfile.j2#L254