From d743b25c8f0c96516d9c374ee946e93e937e2c5b Mon Sep 17 00:00:00 2001 From: reivilibre Date: Wed, 27 Apr 2022 14:39:41 +0100 Subject: Use supervisord to supervise Postgres and Caddy in the Complement image. (#12480) Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> --- docker/complement/SynapseWorkers.Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'docker/complement/SynapseWorkers.Dockerfile') diff --git a/docker/complement/SynapseWorkers.Dockerfile b/docker/complement/SynapseWorkers.Dockerfile index 65df2d114d..9a4438e730 100644 --- a/docker/complement/SynapseWorkers.Dockerfile +++ b/docker/complement/SynapseWorkers.Dockerfile @@ -34,13 +34,16 @@ WORKDIR /data # Copy the caddy config COPY conf-workers/caddy.complement.json /root/caddy.json +COPY conf-workers/postgres.supervisord.conf /etc/supervisor/conf.d/postgres.conf +COPY conf-workers/caddy.supervisord.conf /etc/supervisor/conf.d/caddy.conf + # Copy the entrypoint COPY conf-workers/start-complement-synapse-workers.sh / # Expose caddy's listener ports EXPOSE 8008 8448 -ENTRYPOINT /start-complement-synapse-workers.sh +ENTRYPOINT ["/start-complement-synapse-workers.sh"] # Update the healthcheck to have a shorter check interval HEALTHCHECK --start-period=5s --interval=1s --timeout=1s \ -- cgit 1.4.1