From f00269c0f2828cbdfdf8411c9c4b63ae3b40691d Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Fri, 5 Jan 2024 16:05:09 +0100 Subject: [PATCH] Replace supervisord with caretakerd --- images/onlyoffice-docserver/Dockerfile | 9 ++++++--- .../onlyoffice-docserver/root/etc/caretakerd.yaml | 15 +++++++++++++++ .../root/etc/supervisord.conf | 8 -------- .../root/etc/supervisord.d/ds-converter.ini | 11 ----------- .../root/etc/supervisord.d/ds-docserver.ini | 11 ----------- .../root/etc/supervisord.d/ds-metrics.ini | 11 ----------- .../root/etc/supervisord.d/ds-nginx.ini | 12 ------------ .../root/etc/supervisord.d/ds.ini | 2 -- variables.yml | 2 +- 9 files changed, 22 insertions(+), 59 deletions(-) create mode 100644 images/onlyoffice-docserver/root/etc/caretakerd.yaml delete mode 100644 images/onlyoffice-docserver/root/etc/supervisord.conf delete mode 100644 images/onlyoffice-docserver/root/etc/supervisord.d/ds-converter.ini delete mode 100644 images/onlyoffice-docserver/root/etc/supervisord.d/ds-docserver.ini delete mode 100644 images/onlyoffice-docserver/root/etc/supervisord.d/ds-metrics.ini delete mode 100644 images/onlyoffice-docserver/root/etc/supervisord.d/ds-nginx.ini delete mode 100644 images/onlyoffice-docserver/root/etc/supervisord.d/ds.ini diff --git a/images/onlyoffice-docserver/Dockerfile b/images/onlyoffice-docserver/Dockerfile index da2a0b9..6e89529 100644 --- a/images/onlyoffice-docserver/Dockerfile +++ b/images/onlyoffice-docserver/Dockerfile @@ -1,7 +1,8 @@ FROM [[ .docker.repo ]][[ .docker.base_images.alma9.image ]] MAINTAINER [[ .docker.maintainer ]] -ARG OO_VERSION=7.5.1 +ARG OO_VERSION=7.5.1 \ + CARETAKERD_VERSION=1.0.8 ENV LANG=[[ .locale.lang ]] \ TZ=[[ .locale.tz ]] \ @@ -35,9 +36,11 @@ RUN set -euxo pipefail &&\ dnf \ postgresql16 \ onlyoffice-documentserver \ - supervisor \ nginx \ &&\ + curl -sSL https://github.com/echocat/caretakerd/releases/download/v${CARETAKERD_VERSION}/caretakerd-linux-amd64.tar.gz | \ + tar xvz --exclude caretakerd.html -C /usr/local/bin &&\ + chmod +x /usr/local/bin/caretakerd &&\ dnf clean all &&\ rm -rf /var/cache/dnf/* /var/cache/yum/* /var/log/dnf* /var/log/yum/* /var/lib/dnf/history* @@ -47,4 +50,4 @@ EXPOSE 8819 USER ds -CMD ["supervisord", "-n", "-c", "/etc/supervisord.conf"] +CMD ["caretakerd", "run"] diff --git a/images/onlyoffice-docserver/root/etc/caretakerd.yaml b/images/onlyoffice-docserver/root/etc/caretakerd.yaml new file mode 100644 index 0000000..cd1be71 --- /dev/null +++ b/images/onlyoffice-docserver/root/etc/caretakerd.yaml @@ -0,0 +1,15 @@ +services: + docserver: + type: master + command: ["/var/www/onlyoffice/documentserver/server/DocService/docservice"] + preCommands: + - ["rm", "-f", "/tmp/oods.sock"] + directory: /var/www/onlyoffice/documentserver/server/DocService + metrics: + command: ["/var/www/onlyoffice/documentserver/server/Metrics/metrics", "./config/config.js"] + directory: /var/www/onlyoffice/documentserver/server/Metrics + converter: + command: ["/var/www/onlyoffice/documentserver/server/FileConverter/converter"] + directory: /var/www/onlyoffice/documentserver/server/FileConverter + nginx: + command: ["/usr/sbin/nginx", "-c", "/tmp/nginx.conf"] diff --git a/images/onlyoffice-docserver/root/etc/supervisord.conf b/images/onlyoffice-docserver/root/etc/supervisord.conf deleted file mode 100644 index c94ef46..0000000 --- a/images/onlyoffice-docserver/root/etc/supervisord.conf +++ /dev/null @@ -1,8 +0,0 @@ -[supervisord] -pidfile=/tmp/supervisord.pi -nodaemon=true -logfile=/dev/stdout -logfile_maxbytes=0 - -[include] -files = supervisord.d/*.ini diff --git a/images/onlyoffice-docserver/root/etc/supervisord.d/ds-converter.ini b/images/onlyoffice-docserver/root/etc/supervisord.d/ds-converter.ini deleted file mode 100644 index d4f611d..0000000 --- a/images/onlyoffice-docserver/root/etc/supervisord.d/ds-converter.ini +++ /dev/null @@ -1,11 +0,0 @@ -[program:converter] -command=/var/www/onlyoffice/documentserver/server/FileConverter/converter -directory=/var/www/onlyoffice/documentserver/server/FileConverter -stdout_logfile=/proc/self/fd/1 -stdout_logfile_backups=0 -stdout_logfile_maxbytes=0 -stderr_logfile=/proc/self/fd/2 -stderr_logfile_backups=0 -stderr_logfile_maxbytes=0 -autostart=true -autorestart=true diff --git a/images/onlyoffice-docserver/root/etc/supervisord.d/ds-docserver.ini b/images/onlyoffice-docserver/root/etc/supervisord.d/ds-docserver.ini deleted file mode 100644 index 19a0d96..0000000 --- a/images/onlyoffice-docserver/root/etc/supervisord.d/ds-docserver.ini +++ /dev/null @@ -1,11 +0,0 @@ -[program: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 -stdout_logfile_maxbytes=0 -stderr_logfile=/proc/self/fd/2 -stderr_logfile_backups=0 -stderr_logfile_maxbytes=0 -autostart=true -autorestart=true diff --git a/images/onlyoffice-docserver/root/etc/supervisord.d/ds-metrics.ini b/images/onlyoffice-docserver/root/etc/supervisord.d/ds-metrics.ini deleted file mode 100644 index 1605fa5..0000000 --- a/images/onlyoffice-docserver/root/etc/supervisord.d/ds-metrics.ini +++ /dev/null @@ -1,11 +0,0 @@ -[program:metrics] -command=/var/www/onlyoffice/documentserver/server/Metrics/metrics ./config/config.js -directory=/var/www/onlyoffice/documentserver/server/Metrics -stdout_logfile=/proc/self/fd/1 -stdout_logfile_backups=0 -stdout_logfile_maxbytes=0 -stderr_logfile=/proc/self/fd/2 -stderr_logfile_backups=0 -stderr_logfile_maxbytes=0 -autostart=true -autorestart=true diff --git a/images/onlyoffice-docserver/root/etc/supervisord.d/ds-nginx.ini b/images/onlyoffice-docserver/root/etc/supervisord.d/ds-nginx.ini deleted file mode 100644 index dbcc80b..0000000 --- a/images/onlyoffice-docserver/root/etc/supervisord.d/ds-nginx.ini +++ /dev/null @@ -1,12 +0,0 @@ -[program:nginx] -command=/usr/sbin/nginx -c /tmp/nginx.conf -directory=/ -stdout_logfile=/proc/self/fd/1 -stdout_logfile_backups=0 -stdout_logfile_maxbytes=0 -stderr_logfile=/proc/self/fd/2 -stderr_logfile_backups=0 -stderr_logfile_maxbytes=0 -autostart=true -autorestart=true - diff --git a/images/onlyoffice-docserver/root/etc/supervisord.d/ds.ini b/images/onlyoffice-docserver/root/etc/supervisord.d/ds.ini deleted file mode 100644 index 7c02b8b..0000000 --- a/images/onlyoffice-docserver/root/etc/supervisord.d/ds.ini +++ /dev/null @@ -1,2 +0,0 @@ -[group:ds] -programs=docservice,converter,metrics,nginx diff --git a/variables.yml b/variables.yml index d98faac..4d9380b 100644 --- a/variables.yml +++ b/variables.yml @@ -9,7 +9,7 @@ oo: # Document Services ds: # Docker image to use - image: '[[ .docker.repo ]]onlyoffice-docserver:7.5.1-5' + image: '[[ .docker.repo ]]onlyoffice-docserver:7.5.1-8' # Resource allocation for OnlyOffice itself resources: