DVL-008 Fix chosen server versions to test against

.tests/.lib.sh

@@ -330,6 +330,18 @@ devilbox_start() {
 	_srv2="${3}"
 	_ver2="${4}"
 
+	# Default values for remaining servers
+	_def_php="php-fpm-7.0"
+	_def_httpd="nginx-stable"
+	_def_mysql="mariadb-10.0"
+	_def_pgsql="9.6"
+
+	# Specific enabled servers
+	_set_php=""
+	_set_httpd=""
+	_set_mysql=""
+	_set_pgsql=""
+
 	# Print Headline
 	print_h1 "${_srv1}-${_ver1} vs ${_srv2}-${_ver2}"
 
@@ -338,13 +350,13 @@ devilbox_start() {
 
 	# Enable Type 1
 	if [ "${_srv1}" = "HTTPD" ]; then
-		enable_docker_httpd "${_ver1}"
+		_set_httpd="${_ver1}"
 	elif [ "${_srv1}" = "MYSQL" ]; then
-		enable_docker_mysql "${_ver1}"
+		_set_mysql="${_ver1}"
 	elif [ "${_srv1}" = "PGSQL" ]; then
-		enable_docker_pgsql "${_ver1}"
+		_set_pgsql="${_ver1}"
 	elif [ "${_srv1}" = "PHP" ]; then
-		enable_docker_php "${_ver1}"
+		_set_php="${_ver1}"
 	else
 		echo "Invalid server: ${_srv1}"
 		exit 1
@@ -352,18 +364,38 @@ devilbox_start() {
 
 	# Enable Type 2
 	if [ "${_srv2}" = "HTTPD" ]; then
-		enable_docker_httpd "${_ver2}"
+		_set_httpd="${_ver2}"
 	elif [ "${_srv2}" = "MYSQL" ]; then
-		enable_docker_mysql "${_ver2}"
+		_set_mysql="${_ver2}"
 	elif [ "${_srv2}" = "PGSQL" ]; then
-		enable_docker_pgsql "${_ver2}"
+		_set_pgsql="${_ver2}"
 	elif [ "${_srv2}" = "PHP" ]; then
-		enable_docker_php "${_ver1}"
+		_set_php="${_ver2}"
 	else
 		echo "Invalid server: ${_srv2}"
 		exit 1
 	fi
 
+	# Enable remaining onces
+	if [ "${_set_php}" = "" ]; then
+		_set_php="${_def_php}"
+	fi
+	if [ "${_set_httpd}" = "" ]; then
+		_set_httpd="${_def_httpd}"
+	fi
+	if [ "${_set_mysql}" = "" ]; then
+		_set_mysql="${_def_mysql}"
+	fi
+	if [ "${_set_pgsql}" = "" ]; then
+		_set_pgsql="${_def_pgsql}"
+	fi
+
+	# Set versions in .env file
+	enable_docker_php "${_set_php}"
+	enable_docker_httpd "${_set_httpd}"
+	enable_docker_mysql "${_set_mysql}"
+	enable_docker_pgsql "${_set_pgsql}"
+
 	# Show Server settings
 	echo "Enable SERVERs"
 	echo "--------------"

.travis.yml

@@ -1,5 +1,6 @@
-language: bash
+###
-dist: trusty
+### Enable sudo (required for docker service)
+###
 sudo: required