diff --git a/images/onlyoffice-docserver/root/entrypoint.d/10-conf.sh b/images/onlyoffice-docserver/root/entrypoint.d/10-conf.sh index 7fa60a7..083e128 100755 --- a/images/onlyoffice-docserver/root/entrypoint.d/10-conf.sh +++ b/images/onlyoffice-docserver/root/entrypoint.d/10-conf.sh @@ -3,4 +3,4 @@ set -euo pipefail echo "Replacing env variable in nginx config" -busybox awk -f /usr/local/bin/envsubst < /etc/nginx/nginx.conf > /tmp/nginx.conf +/usr/local/bin/envsubst < /etc/nginx/nginx.conf > /tmp/nginx.conf diff --git a/images/onlyoffice-docserver/root/etc/supervisord.d/ds-docserver.ini b/images/onlyoffice-docserver/root/etc/supervisord.d/ds-docserver.ini index 5512c81..19a0d96 100644 --- a/images/onlyoffice-docserver/root/etc/supervisord.d/ds-docserver.ini +++ b/images/onlyoffice-docserver/root/etc/supervisord.d/ds-docserver.ini @@ -1,5 +1,5 @@ [program:docservice] -command=/var/www/onlyoffice/documentserver/server/DocService/docservice +command=sh -c "rm -f /tmp/oods.sock && exec /var/www/onlyoffice/documentserver/server/DocService/docservice" directory=/var/www/onlyoffice/documentserver/server/DocService stdout_logfile=/proc/self/fd/1 stdout_logfile_backups=0 diff --git a/onlyoffice-docserver.nomad.hcl b/onlyoffice-docserver.nomad.hcl index 104b61c..78d707e 100644 --- a/onlyoffice-docserver.nomad.hcl +++ b/onlyoffice-docserver.nomad.hcl @@ -15,15 +15,19 @@ job [[ .oo.instance | toJSON ]] { volume "data" { type = [[ .oo.volumes.data.type | toJSON ]] source = [[ .oo.volumes.data.source | toJSON ]] +[[- if ne .oo.volumes.data.type "host" ]] access_mode = "single-node-writer" attachment_mode = "file-system" +[[- end ]] } volume "rabbitmq" { type = [[ .oo.volumes.rabbitmq.type | toJSON ]] source = [[ .oo.volumes.rabbitmq.source | toJSON ]] +[[- if ne .oo.volumes.rabbitmq.type "host" ]] access_mode = "single-node-writer" attachment_mode = "file-system" +[[- end ]] } service { diff --git a/variables.yml b/variables.yml index 08cdcef..b5229f6 100644 --- a/variables.yml +++ b/variables.yml @@ -9,11 +9,11 @@ oo: # Document Services ds: # Docker image to use - image: danielberteaud/onlyoffice-docserver:7.5.1-1 + image: danielberteaud/onlyoffice-docserver:7.5.1-5 # Resource allocation for OnlyOffice itself resources: - cpu: 200 + cpu: 300 memory: 512 # The URL where OnlyOffice is available @@ -73,7 +73,7 @@ oo: # Resource allocation resources: - cpu: 80 + cpu: 200 memory: 156 # Volume used