Compare commits
2 Commits
87d9fff606
...
33ab43c8e2
Author | SHA1 | Date |
---|---|---|
Daniel Berteaud | 33ab43c8e2 | |
Daniel Berteaud | f969959db6 |
|
@ -1,7 +1,7 @@
|
|||
FROM danielberteaud/alma:9.24.1-6
|
||||
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
|
||||
|
||||
ARG OO_VERSION=7.5.1
|
||||
ARG OO_VERSION=8.0.0
|
||||
|
||||
ENV NGINX_LISTEN_IP=0.0.0.0 \
|
||||
NODE_ENV=production-linux \
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
set -euo pipefail
|
||||
|
||||
export PGHOST=${OO_DB_HOST}
|
||||
export DGPORT=${OO_DB_PORT}
|
||||
export PGPORT=${OO_DB_PORT}
|
||||
export PGDATABASE=${OO_DB_NAME}
|
||||
export PGUSER=${OO_DB_USER}
|
||||
export PGPASSWORD=${OO_DB_PASS}
|
||||
|
|
|
@ -80,10 +80,10 @@ job "onlyoffice" {
|
|||
tags = [
|
||||
|
||||
"traefik.enable=true",
|
||||
"traefik.http.routers.onlyoffice.rule=Host(`oods.example.org`)",
|
||||
"traefik.http.routers.onlyoffice.entrypoints=https",
|
||||
"traefik.http.middlewares.onlyoffice-csp.headers.contentsecuritypolicy=connect-src 'self' https://www.zotero.org https://cdn.jsdelivr.net https://cdn.rawgit.com https://translate.googleapis.com https://code.responsivevoice.org https://onlyoffice.github.io;default-src 'self';font-src 'self' data: https://fonts.googleapis.com https://fonts.gstatic.com;frame-src 'self' https://www.youtube.com https://onlyoffice.github.io;img-src 'self' data: https://*;media-src 'self' https://code.responsivevoice.org;script-src 'self' 'wasm-unsafe-eval' 'unsafe-inline' 'unsafe-eval' blob: https://ajax.googleapis.com https://www.youtube.com/ https://*.cloudfront.net https://cdn.rawgit.com https://code.jquery.com https://translate.googleapis.com https://code.responsivevoice.org https://cdn.jsdelivr.net https://onlyoffice.github.io;style-src 'self' 'unsafe-inline' data: https://fonts.googleapis.com https://translate.googleapis.com https://onlyoffice.github.io;",
|
||||
"traefik.http.routers.onlyoffice.middlewares=security-headers@file,rate-limit-std@file,forward-proto@file,inflight-std@file,hsts@file,compression@file,onlyoffice-csp",
|
||||
"traefik.http.routers.onlyoffice.rule=Host(`oods.example.org`)",
|
||||
"traefik.http.middlewares.csp-onlyoffice.headers.contentsecuritypolicy=connect-src 'self' https://www.zotero.org https://cdn.jsdelivr.net https://cdn.rawgit.com https://translate.googleapis.com https://code.responsivevoice.org https://onlyoffice.github.io;default-src 'self';font-src 'self' data: https://fonts.googleapis.com https://fonts.gstatic.com;frame-src 'self' https://www.youtube.com https://onlyoffice.github.io;img-src 'self' data: https://*;media-src 'self' https://code.responsivevoice.org;script-src 'self' 'wasm-unsafe-eval' 'unsafe-inline' 'unsafe-eval' blob: https://ajax.googleapis.com https://www.youtube.com/ https://*.cloudfront.net https://cdn.rawgit.com https://code.jquery.com https://translate.googleapis.com https://code.responsivevoice.org https://cdn.jsdelivr.net https://onlyoffice.github.io;style-src 'self' 'unsafe-inline' data: https://fonts.googleapis.com https://translate.googleapis.com https://onlyoffice.github.io;",
|
||||
"traefik.http.routers.onlyoffice.middlewares=security-headers@file,rate-limit-std@file,forward-proto@file,inflight-std@file,hsts@file,compression@file,csp-onlyoffice",
|
||||
|
||||
]
|
||||
|
||||
|
@ -94,7 +94,7 @@ job "onlyoffice" {
|
|||
leader = true
|
||||
|
||||
config {
|
||||
image = "danielberteaud/onlyoffice-docserver:7.5.1-9"
|
||||
image = "danielberteaud/onlyoffice-docserver:8.0.0-2"
|
||||
pids_limit = 200
|
||||
readonly_rootfs = true
|
||||
volumes = [
|
||||
|
|
|
@ -1,19 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
set -eu
|
||||
|
||||
|
||||
|
||||
if [ "onlyoffice" != "onlyoffice" ]; then
|
||||
for DIR in vault consul nomad; do
|
||||
if [ -d output/${DIR} ]; then
|
||||
for FILE in $(find output/${DIR} -name "*onlyoffice*.hcl" -type f); do
|
||||
NEW_FILE=$(echo "${FILE}" | sed -E "s/onlyoffice/onlyoffice/g")
|
||||
mv "${FILE}" "${NEW_FILE}"
|
||||
done
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
FROM [[ .docker.repo ]][[ .docker.base_images.alma9.image ]]
|
||||
MAINTAINER [[ .docker.maintainer ]]
|
||||
|
||||
ARG OO_VERSION=7.5.1
|
||||
ARG OO_VERSION=[[ .oo.ds.version ]]
|
||||
|
||||
ENV NGINX_LISTEN_IP=0.0.0.0 \
|
||||
NODE_ENV=production-linux \
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
set -euo pipefail
|
||||
|
||||
export PGHOST=${OO_DB_HOST}
|
||||
export DGPORT=${OO_DB_PORT}
|
||||
export PGPORT=${OO_DB_PORT}
|
||||
export PGDATABASE=${OO_DB_NAME}
|
||||
export PGUSER=${OO_DB_USER}
|
||||
export PGPASSWORD=${OO_DB_PASS}
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
[[ template "common/mv_conf.sh" dict "ctx" . "services" (dict "onlyoffice" .instance) ]]
|
|
@ -8,8 +8,12 @@ oo:
|
|||
|
||||
# Document Services
|
||||
ds:
|
||||
|
||||
# Version of OnlyOffice
|
||||
version: 8.0.0
|
||||
|
||||
# Docker image to use
|
||||
image: '[[ .docker.repo ]]onlyoffice-docserver:7.5.1-9'
|
||||
image: '[[ .docker.repo ]]onlyoffice-docserver:[[ .oo.ds.version ]]-2'
|
||||
|
||||
# Resource allocation for OnlyOffice itself
|
||||
resources:
|
||||
|
|
Loading…
Reference in New Issue