template db, add release note
continuous-integration/drone/pr Build is failing Details
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Philipp Rothmann 2022-08-09 10:43:22 +02:00
parent f97bb24bc9
commit 21d67d0113
4 changed files with 36 additions and 7 deletions

View File

@ -2,6 +2,8 @@ TYPE=onlyoffice
LETS_ENCRYPT_ENV=production LETS_ENCRYPT_ENV=production
DOMAIN=onlyoffice.example.com DOMAIN=onlyoffice.example.com
SECRET_DB_PASSWORD_VERSION=v1
AUTO_ASSEMBLY_ENABLED=false AUTO_ASSEMBLY_ENABLED=false
AUTO_ASSEMBLY_INTERVAL=5min AUTO_ASSEMBLY_INTERVAL=5min
AUTO_ASSEMBLY_STEP=1min AUTO_ASSEMBLY_STEP=1min

View File

@ -19,6 +19,8 @@ services:
AUTO_ASSEMBLY_ENABLED: AUTO_ASSEMBLY_ENABLED:
AUTO_ASSEMBLY_INTERVAL: AUTO_ASSEMBLY_INTERVAL:
AUTO_ASSEMBLY_STEP: AUTO_ASSEMBLY_STEP:
secrets:
- db_password
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost/welcome"] test: ["CMD", "curl", "-f", "http://localhost/welcome"]
interval: 30s interval: 30s
@ -59,9 +61,11 @@ services:
environment: environment:
POSTGRES_DB: onlyoffice POSTGRES_DB: onlyoffice
POSTGRES_USER: onlyoffice POSTGRES_USER: onlyoffice
POSTGRES_HOST_AUTH_METHOD: trust POSTGRES_PASSWORD_FILE: /run/secrets/db_password
volumes: volumes:
- db:/var/lib/postgresql/data - db:/var/lib/postgresql/data
secrets:
- db_password
networks: networks:
- internal - internal
healthcheck: healthcheck:
@ -79,6 +83,11 @@ networks:
external: true external: true
internal: internal:
secrets:
db_password:
external: true
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
configs: configs:
local_json: local_json:
name: ${STACK_NAME}_local_json_${LOCAL_JSON_VERSION} name: ${STACK_NAME}_local_json_${LOCAL_JSON_VERSION}

View File

@ -2,12 +2,12 @@
"services": { "services": {
"CoAuthoring": { "CoAuthoring": {
"sql": { "sql": {
"type": "postgres", "type": "{{ env "DB_TYPE" }}",
"dbHost": "db", "dbHost": "{{ env "DB_HOST" }}",
"dbPort": "5432", "dbPort": "{{ env "DB_PORT" }}",
"dbName": "onlyoffice", "dbName": "{{ env "DB_NAME" }}",
"dbUser": "onlyoffice", "dbUser": "{{ env "DB_USER" }}",
"dbPass": "onlyoffice" "dbPass": "{{ secret "db_password" }}"
}, },
{{ if eq (env "JWT_ENABLED") "true" }} {{ if eq (env "JWT_ENABLED") "true" }}
"token": { "token": {

18
releases/0.1.0+7.1.1 Normal file
View File

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