From 63a65fa82c68454c722985964df4b9e4f6925c4a Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 27 Jul 2020 16:00:51 +0200
Subject: [PATCH 1/2] Bump compose config version

---
 base.yml                      | 2 +-
 db.mariadb.yml                | 2 +-
 db.mssql.5.6.yml              | 2 +-
 db.mssql.yml                  | 2 +-
 db.mysql.yml                  | 2 +-
 db.oracle.yml                 | 2 +-
 moodle-app-dev.yml            | 2 +-
 moodle-app.yml                | 2 +-
 phpunit-external-services.yml | 2 +-
 selenium.chrome.yml           | 2 +-
 selenium.debug.yml            | 2 +-
 service.mail.yml              | 2 +-
 volumes-cached.yml            | 2 +-
 webserver.port.yml            | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/base.yml b/base.yml
index 2ede0f99298..8d50d8082e4 100755
--- a/base.yml
+++ b/base.yml
@@ -1,4 +1,4 @@
-version: "2"
+version: "2.3"
 services:
   webserver:
     image: "moodlehq/moodle-php-apache:${MOODLE_DOCKER_PHP_VERSION}"
diff --git a/db.mariadb.yml b/db.mariadb.yml
index 61cac881baa..dad046cd62e 100644
--- a/db.mariadb.yml
+++ b/db.mariadb.yml
@@ -1,4 +1,4 @@
-version: "2"
+version: "2.3"
 services:
   webserver:
     environment:
diff --git a/db.mssql.5.6.yml b/db.mssql.5.6.yml
index 16375e9da43..4529dceb667 100644
--- a/db.mssql.5.6.yml
+++ b/db.mssql.5.6.yml
@@ -1,4 +1,4 @@
-version: "2"
+version: "2.3"
 services:
   webserver:
     environment:
diff --git a/db.mssql.yml b/db.mssql.yml
index 80d24e72a65..05dd6a925db 100644
--- a/db.mssql.yml
+++ b/db.mssql.yml
@@ -1,4 +1,4 @@
-version: "2"
+version: "2.3"
 services:
   webserver:
     environment:
diff --git a/db.mysql.yml b/db.mysql.yml
index 368785f9981..6d1954909f0 100644
--- a/db.mysql.yml
+++ b/db.mysql.yml
@@ -1,4 +1,4 @@
-version: "2"
+version: "2.3"
 services:
   webserver:
     environment:
diff --git a/db.oracle.yml b/db.oracle.yml
index 075c3663345..fe50f449c93 100644
--- a/db.oracle.yml
+++ b/db.oracle.yml
@@ -1,4 +1,4 @@
-version: "2"
+version: "2.3"
 services:
   webserver:
     environment:
diff --git a/moodle-app-dev.yml b/moodle-app-dev.yml
index 7fd566a5d24..601a478013e 100644
--- a/moodle-app-dev.yml
+++ b/moodle-app-dev.yml
@@ -1,4 +1,4 @@
-version: "2"
+version: "2.3"
 services:
   webserver:
     environment:
diff --git a/moodle-app.yml b/moodle-app.yml
index cbadebb1c06..6d16e923e3c 100644
--- a/moodle-app.yml
+++ b/moodle-app.yml
@@ -1,4 +1,4 @@
-version: "2"
+version: "2.3"
 services:
   webserver:
     environment:
diff --git a/phpunit-external-services.yml b/phpunit-external-services.yml
index 1ca2f264c51..017e9b994c3 100644
--- a/phpunit-external-services.yml
+++ b/phpunit-external-services.yml
@@ -1,4 +1,4 @@
-version: "2"
+version: "2.3"
 services:
   webserver:
       environment:
diff --git a/selenium.chrome.yml b/selenium.chrome.yml
index d7f6ad3b425..525a6fdd13f 100644
--- a/selenium.chrome.yml
+++ b/selenium.chrome.yml
@@ -1,4 +1,4 @@
-version: "2"
+version: "2.3"
 services:
   webserver:
     environment:
diff --git a/selenium.debug.yml b/selenium.debug.yml
index 828fd2c4c8a..660da407492 100644
--- a/selenium.debug.yml
+++ b/selenium.debug.yml
@@ -1,4 +1,4 @@
-version: "2"
+version: "2.3"
 services:
   selenium:
     ports:
diff --git a/service.mail.yml b/service.mail.yml
index 812ab0e7e04..376b51e1191 100644
--- a/service.mail.yml
+++ b/service.mail.yml
@@ -1,4 +1,4 @@
-version: "2"
+version: "2.3"
 services:
   webserver:
     volumes:
diff --git a/volumes-cached.yml b/volumes-cached.yml
index dedeb9e8352..a54deb4b4bf 100644
--- a/volumes-cached.yml
+++ b/volumes-cached.yml
@@ -1,6 +1,6 @@
 # Here we support https://docs.docker.com/docker-for-mac/osxfs-caching/
 # for improved performance on mac
-version: "2"
+version: "2.3"
 services:
   webserver:
     volumes:
diff --git a/webserver.port.yml b/webserver.port.yml
index bff93e6331b..2bfe34ff3f6 100644
--- a/webserver.port.yml
+++ b/webserver.port.yml
@@ -1,4 +1,4 @@
-version: "2"
+version: "2.3"
 services:
   webserver:
     environment:

From df3f51d2932a639db8f6acc36a0498e33c682590 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 27 Jul 2020 16:01:37 +0200
Subject: [PATCH 2/2] Implement moodle-app-dev healthcheck

---
 moodle-app-dev.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/moodle-app-dev.yml b/moodle-app-dev.yml
index 601a478013e..4354e3933f7 100644
--- a/moodle-app-dev.yml
+++ b/moodle-app-dev.yml
@@ -9,6 +9,11 @@ services:
     command: npm run ionic:serve
     volumes:
       - "${MOODLE_DOCKER_APP_PATH}:/app"
+    healthcheck:
+      test: "curl -f http://localhost:8100 || exit 1"
+      interval: 10s
+      timeout: 3s
+      start_period: 30s
     expose:
       - 8100
       - 35729