From c5beea3114e9ed4591a4620921bb529d4178ae15 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Fri, 2 Oct 2020 09:37:36 +0200 Subject: [PATCH] Apply @3wordchant patch Didn't bring over "depends_on" because I think it is ignored? --- compose.mailrelay.yml | 4 ++-- compose.yml | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/compose.mailrelay.yml b/compose.mailrelay.yml index eef92c5..92760ad 100644 --- a/compose.mailrelay.yml +++ b/compose.mailrelay.yml @@ -1,8 +1,8 @@ --- version: "3.8" - + services: - wordpress: + app: entrypoint: /docker-entrypoint.sh environment: - SMTP_HOST=${SMTP_HOST} diff --git a/compose.yml b/compose.yml index 221bc6c..dbe5346 100644 --- a/compose.yml +++ b/compose.yml @@ -10,13 +10,19 @@ services: - backend - proxy environment: - - WORDPRESS_DB_HOST=mariadb + - WORDPRESS_DB_HOST=db - WORDPRESS_DB_USER=wordpress - WORDPRESS_DB_PASSWORD_FILE=/run/secrets/db_password - WORDPRESS_DB_NAME=wordpress - WORDPRESS_CONFIG_EXTRA=${WORDPRESS_CONFIG_EXTRA} secrets: - db_password + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost"] + interval: 30s + timeout: 10s + retries: 10 + start_period: 1m deploy: update_config: failure_action: rollback