chore: publish 2.6.0+7.4.0 release

local.json is automatically generated and can change due to updates,
to prevent breaking changes, only append the necssary config
using a custom entrypoint.

.drone.yml

@@ -3,10 +3,12 @@ kind: pipeline
 name: deploy to swarm-test.autonomic.zone
 steps:
   - name: deployment
-    image: decentral1se/stack-ssh-deploy:latest
+    image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
     settings:
       host: swarm-test.autonomic.zone
       stack: onlyoffice
+      networks:
+       - proxy
       generate_secrets: true
       purge: true
       deploy_key:
@@ -15,16 +17,24 @@ steps:
       DOMAIN: onlyoffice.swarm-test.autonomic.zone
       STACK_NAME: onlyoffice
       LETS_ENCRYPT_ENV: production
+      ENTRYPOINT_VERSION: v1
+      SECRET_DB_PASSWORD_VERSION: v1
 trigger:
   branch:
     - main
 ---
 kind: pipeline
-name: recipe release
+name: generate recipe catalogue
 steps:
   - name: release a new version
-    image: thecoopcloud/drone-abra:latest
+    image: plugins/downstream
     settings:
-      command: recipe onlyoffice release
-      deploy_key:
-        from_secret: abra_bot_deploy_key
+      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

@@ -1,3 +1,15 @@
 TYPE=onlyoffice
-DOMAIN=onlyoffice.example.com
+TIMEOUT=300
+ENABLE_AUTO_UPDATE=true
 LETS_ENCRYPT_ENV=production
+DOMAIN=onlyoffice.example.com
+
+SECRET_DB_PASSWORD_VERSION=v1
+
+AUTO_ASSEMBLY_ENABLED=false
+AUTO_ASSEMBLY_INTERVAL=5min
+AUTO_ASSEMBLY_STEP=1min
+#
+# Uncomment to enable JWT Secret
+# COMPOSE_FILE=compose.yml:compose.jwt.yml
+# SECRET_JWT_SECRET_VERSION=v1

README.md

@@ -7,17 +7,21 @@
 * **Category**: Apps
 * **Status**: 3, stable
 * **Image**: [`onlyoffice`](https://hub.docker.com/r/onlyoffice/documentserver/), 4, upstream
-* **Healthcheck**: No
+* **Healthcheck**: Yes
 * **Backups**: No
-* **Email**: 3
+* **Email**: N/A
 * **Tests**: 2
 * **SSO**: No
 <!-- endmetadata -->
 
 ## Basic usage
 
-1. Set up Docker Swarm and [`abra`](https://git.autonomic.zone/coop-cloud/abra)
-1. Deploy [`coop-cloud/traefik`](https://git.autonomic.zone/coop-cloud/traefik)
-1. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to
-   your Docker swarm box
-1. `abra app YOURAPPDOMAIN deploy`
+* `abra app new onlyoffice`
+* `abra app config <app-name>`
+    - uncomment `COMPOSE_FILE` and `SECRET_JWT_SECRET_VERSION` to enable JWT Secret
+* `abra app secret generate -a <app-name>`
+* `abra app deploy <app-name>`
+
+
+For more, see [`docs.coopcloud.tech`](https://docs.coopcloud.tech) and [`ONLYOFFICE/Docker-DocumentServer`](https://github.com/ONLYOFFICE/Docker-DocumentServer).
+[Official Onlyoffice docker compose](https://github.com/ONLYOFFICE/Docker-DocumentServer/blob/master/docker-compose.yml)

abra.sh

@@ -0,0 +1,5 @@
+export ENTRYPOINT_VERSION=v1
+
+prepare_shutdown () {
+  documentserver-prepare4shutdown.sh    
+}

compose.jwt.yml

@@ -0,0 +1,15 @@
+version: '3.8'
+services:
+  app:
+    environment:
+      - JWT_ENABLED=true
+      - JWT_HEADER=Authorization
+      - JWT_IN_BODY=true
+      - JWT_SECRET_FILE=/run/secrets/jwt_secret
+    secrets:
+      - jwt_secret
+
+secrets:
+  jwt_secret:
+    external: true
+    name: ${STACK_NAME}_jwt_secret_${SECRET_JWT_SECRET_VERSION}

compose.yml

@@ -1,20 +1,100 @@
-version: "3.8"
+version: '3.8'
 services:
   app:
-    image: "onlyoffice/documentserver:6.3"
+    image: onlyoffice/documentserver:7.4.0
+    depends_on:
+      - db
+      - rabbitmq
+    stdin_open: true
     networks:
       - proxy
+      - internal 
+    environment:
+      DB_TYPE: postgres
+      DB_HOST: db
+      DB_PORT: 5432
+      DB_NAME: onlyoffice
+      DB_USER: onlyoffice
+      DB_PWD_FILE: /run/secrets/db_password
+      AMQP_URI: amqp://guest:guest@rabbitmq
+      AUTO_ASSEMBLY_ENABLED: 
+      AUTO_ASSEMBLY_INTERVAL: 
+      AUTO_ASSEMBLY_STEP: 
+    secrets:
+      - db_password
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost/welcome"]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 1m
+    configs:
+      - source: entrypoint
+        target: /custom-entrypoint.sh
+        mode: 555
+    entrypoint: /custom-entrypoint.sh
     deploy:
       update_config:
         failure_action: rollback
         order: start-first
       labels:
+        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
         - "traefik.enable=true"
+        - "traefik.docker.network=proxy"
+        - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
-        - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - coop-cloud.${STACK_NAME}.app.version=6.3-
+        - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-fwdproto"
+        - "traefik.http.middlewares.${STACK_NAME}-fwdproto.headers.customRequestHeaders.X-Forwarded-Proto=https"
+        - "coop-cloud.${STACK_NAME}.version=2.6.0+7.4.0"
+        
+  rabbitmq:
+    image: rabbitmq:3.12.2
+    networks:
+      - internal
+    healthcheck:
+      test: rabbitmq-diagnostics -q ping
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 1m
+    
+  db:
+    image: postgres:9.5
+    environment:
+      POSTGRES_DB: onlyoffice
+      POSTGRES_USER: onlyoffice
+      POSTGRES_PASSWORD_FILE: /run/secrets/db_password
+    volumes:
+      - db:/var/lib/postgresql/data
+    secrets:
+      - db_password
+    networks:
+      - internal
+    healthcheck:
+      test: ["CMD", "pg_isready"]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 1m
+
+volumes:
+  db:
+
 networks:
   proxy:
     external: true
+  internal:
+
+secrets:
+  db_password:
+    external: true
+    name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
+
+configs:
+  entrypoint:
+    name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
+    file: entrypoint.sh.tmpl
+    template_driver: golang
+

entrypoint.sh.tmpl

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+set -eu
+
+file_env() {
+  local var="$1"
+  local fileVar="${var}_FILE"
+  local def="${2:-}"
+
+  if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
+    echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
+    exit 1
+  fi
+
+  local val="$def"
+  if [ "${!var:-}" ]; then
+    val="${!var}"
+  elif [ "${!fileVar:-}" ]; then
+    val="$(< "${!fileVar}")"
+  fi
+
+  export "$var"="$val"
+  unset "$fileVar"
+}
+
+file_env "DB_PWD"
+file_env "JWT_SECRET"
+
+CONFIG=/etc/onlyoffice/documentserver/local.json
+JSON_BIN=/var/www/onlyoffice/documentserver/npm/json
+JSON="${JSON_BIN} -q -f ${CONFIG}"
+${JSON} -I -e "if(this.services.CoAuthoring.autoAssembly===undefined)this.services.CoAuthoring.autoAssembly={};"
+${JSON} -I -e "this.services.CoAuthoring.autoAssembly.enable = ${AUTO_ASSEMBLY_ENABLED}"
+${JSON} -I -e "this.services.CoAuthoring.autoAssembly.interval = '${AUTO_ASSEMBLY_INTERVAL}'"
+${JSON} -I -e "this.services.CoAuthoring.autoAssembly.step = '${AUTO_ASSEMBLY_STEP}'"
+
+/app/ds/run-document-server.sh

release/2.0.0+7.1.1

@@ -0,0 +1,18 @@
+This release upgrades onlyoffice to v7, adds a seperate postgresdb + rabbitmq
+and adds env variables for the forcesave option.
+
+Please add this to your .env file:
+
+```
+SECRET_DB_PASSWORD_VERSION=v1
+
+AUTO_ASSEMBLY_ENABLED=false
+AUTO_ASSEMBLY_INTERVAL=5min
+AUTO_ASSEMBLY_STEP=1min
+```
+
+If you like to use the forcesave option, set `AUTO_ASSEMBLY_ENABLED=true`.
+
+Don't forget to generate or insert a new db secret: `abra app secret generate onlyoffice.example.org db_password v1`
+
+@yksflip