From 567ba57a13f00022087ae97235bc8eae96b12920 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Thu, 20 Apr 2017 11:19:47 +0200
Subject: [PATCH 1/3] DVL-002 alter travis checks

---
 .tests/.lib.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.tests/.lib.sh b/.tests/.lib.sh
index 2f5db227..468c5427 100644
--- a/.tests/.lib.sh
+++ b/.tests/.lib.sh
@@ -91,6 +91,7 @@ wait_for() {
 	if [ "${#}" = "2" ]; then
 		if [ "${2}" = "1" ]; then
 			printf "wait "
+			# shellcheck disable=SC2034
 			for i in $(seq 1 "${_time}"); do
 				sleep 1
 				printf "."
@@ -377,7 +378,7 @@ debilbox_test() {
 	### Variables
 	###
 	_ret=0 # Final exit code
-	_oks=3 # Require this many [OK]'s on the page
+	_oks=4 # Require this many [OK]'s on the page
 
 
 	###
@@ -489,4 +490,4 @@ _test_curled_oks() {
 	else
 		return 0
 	fi
-}
\ No newline at end of file
+}

From cb512b4ac425861cf8fd8a625156c488049be404 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Thu, 20 Apr 2017 15:36:05 +0200
Subject: [PATCH 2/3] DVL-002 Prevent HHVM from segfaulting during pg_connect

---
 .devilbox/www/include/lib/Postgres.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.devilbox/www/include/lib/Postgres.php b/.devilbox/www/include/lib/Postgres.php
index 0da552df..c65aef5c 100644
--- a/.devilbox/www/include/lib/Postgres.php
+++ b/.devilbox/www/include/lib/Postgres.php
@@ -128,7 +128,8 @@ class Postgres
 		if ($database !== null) {
 			$link = pg_pconnect('host='.$host.' dbname='.$database.' user='.$user.' password='.$pass);
 		} else {
-			$link = pg_pconnect('host='.$host.' user='.$user.' password='.$pass);
+			// NOTE: using dbname=postgres prevents HHVM from segfaulting
+			$link = pg_pconnect('host='.$host.' dbname=postgres user='.$user.' password='.$pass);
 		}
 		error_reporting(-1);
 

From 81072dbfd798e761ba1f7502f345c39f686fce66 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Thu, 20 Apr 2017 16:42:21 +0200
Subject: [PATCH 3/3] DVL-002 Add docker-compose dependencies

---
 docker-compose.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index b36ce865..c595d5c5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,7 @@ services:
   # HTTP
   # ----------------------------------------
   httpd:
+    # TODO: remove latest, once it is ready for the next release
     image: cytopia/${HTTPD_SERVER}:latest
 
     # Manually build via `docker-compose build`
@@ -91,6 +92,9 @@ services:
       # (configured in /etc/${HTTPD_SERVER}/02-vhost-mass.conf)
       - ${HOST_PATH_TO_WWW_DOCROOTS}:/shared/httpd:ro
 
+    depends_on:
+      - php
+
     links:
       # ---- Format: ----
       # SERVICE [ : ALIAS]
@@ -194,6 +198,10 @@ services:
       # (configured in /etc/${HTTPD_SERVER}/02-vhost-mass.conf)
       - ${HOST_PATH_TO_WWW_DOCROOTS}:/shared/httpd
 
+    depends_on:
+      - mysql
+      - postgres
+
 
     links:
       # ---- Format: ----
@@ -206,6 +214,7 @@ services:
   # DATABASE
   # ----------------------------------------
   mysql:
+    # TODO: remove latest, once it is ready for the next release
     image: cytopia/${MYSQL_SERVER}:latest
 
     # Manually build via `docker-compose build`