jiriks74/Docker-DocumentServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes exit procedure. (#286)

Browse Source
This commit is contained in:
Pierre Ozoux 2020-09-10 16:02:20 +02:00 committed by GitHub
parent 380ac3e227
commit 1956f98c1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -82,4 +82,4 @@ RUN echo "$REPO_URL" | tee /etc/apt/sources.list.d/ds.list && \
VOLUME /var/log/$COMPANY_NAME /var/lib/$COMPANY_NAME /var/www/$COMPANY_NAME/Data /var/lib/postgresql /var/lib/rabbitmq /var/lib/redis /usr/share/fonts/truetype/custom VOLUME /var/log/$COMPANY_NAME /var/lib/$COMPANY_NAME /var/www/$COMPANY_NAME/Data /var/lib/postgresql /var/lib/rabbitmq /var/lib/redis /usr/share/fonts/truetype/custom
ENTRYPOINT /app/ds/run-document-server.sh ENTRYPOINT ["/app/ds/run-document-server.sh"]

1
docker-compose.yml
View File

@ -24,6 +24,7 @@ services:
- '443:443' - '443:443'
stdin_open: true stdin_open: true
restart: always restart: always
stop_grace_period: 60s
volumes: volumes:
- /var/www/onlyoffice/Data - /var/www/onlyoffice/Data
- /var/log/onlyoffice - /var/log/onlyoffice

9
run-document-server.sh
View File

@ -1,5 +1,11 @@
#!/bin/bash #!/bin/bash
function clean_exit {
/usr/bin/documentserver-prepare4shutdown.sh
}
trap clean_exit SIGTERM
# Define '**' behavior explicitly # Define '**' behavior explicitly
shopt -s globstar shopt -s globstar
@ -522,4 +528,5 @@ service nginx start
documentserver-generate-allfonts.sh ${ONLYOFFICE_DATA_CONTAINER} documentserver-generate-allfonts.sh ${ONLYOFFICE_DATA_CONTAINER}
documentserver-static-gzip.sh ${ONLYOFFICE_DATA_CONTAINER} documentserver-static-gzip.sh ${ONLYOFFICE_DATA_CONTAINER}
tail -f /var/log/${COMPANY_NAME}/**/*.log tail -f /var/log/${COMPANY_NAME}/**/*.log &
wait $!