Auto accept EULA for CI tests

cytopia · Dec 27, 2018 · 7fabead · 7fabead
1 parent cb7ec86
commit 7fabead
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/.tests/startup-tests/startup.sh b/.tests/startup-tests/startup.sh
@@ -16,15 +16,15 @@ cd "${COMPOSEPATH}" && docker-compose exec -T php bash -c "find /startup.d/*.sh-
 	echo "# ----------------------------------------------------------------------------------------"
 	echo "# [TEST] ${f}"
 	echo "# ----------------------------------------------------------------------------------------"
-	if ! docker exec -t ${CONTAINER} bash "${f}"; then
+	if ! docker exec -t ${CONTAINER} bash "${f}" "ACCEPT_EULA=1"; then
 		sleep 5
-		if ! docker exec -t ${CONTAINER} bash "${f}"; then
+		if ! docker exec -t ${CONTAINER} bash "${f}" "ACCEPT_EULA=1"; then
 			sleep 5
-			if ! docker exec -t ${CONTAINER} bash "${f}"; then
+			if ! docker exec -t ${CONTAINER} bash "${f}" "ACCEPT_EULA=1"; then
 				sleep 5
-				if ! docker exec -t ${CONTAINER} bash "${f}"; then
+				if ! docker exec -t ${CONTAINER} bash "${f}" "ACCEPT_EULA=1"; then
 					sleep 5
-					if ! docker exec -t ${CONTAINER} bash "${f}"; then
+					if ! docker exec -t ${CONTAINER} bash "${f}" "ACCEPT_EULA=1"; then
 						echo "[FAIl] ${f}"
 						exit 1
 					fi

diff --git a/cfg/php-startup-7.0/02-ms-odbc-driver.sh-example b/cfg/php-startup-7.0/02-ms-odbc-driver.sh-example
@@ -32,6 +32,11 @@ MSODBC_URL="https://packages.microsoft.com/debian/8/prod/pool/main/m/msodbcsql17
 ###
 ### Pre-flight check
 ###
+if [ "${#}" = "1" ]; then
+	if [ "${1}" = "ACCEPT_EULA=1" ]; then
+		ACCEPT_EULA=Y
+	fi
+fi
 if [ "${ACCEPT_EULA}" != "Y" ]; then
 	echo "MS ODBC EULA not accepted. Aborting installation."
 	exit 0

diff --git a/cfg/php-startup-7.1/02-ms-odbc-driver.sh-example b/cfg/php-startup-7.1/02-ms-odbc-driver.sh-example
@@ -32,6 +32,11 @@ MSODBC_URL="https://packages.microsoft.com/debian/8/prod/pool/main/m/msodbcsql17
 ###
 ### Pre-flight check
 ###
+if [ "${#}" = "1" ]; then
+	if [ "${1}" = "ACCEPT_EULA=1" ]; then
+		ACCEPT_EULA=Y
+	fi
+fi
 if [ "${ACCEPT_EULA}" != "Y" ]; then
 	echo "MS ODBC EULA not accepted. Aborting installation."
 	exit 0

diff --git a/cfg/php-startup-7.2/02-ms-odbc-driver.sh-example b/cfg/php-startup-7.2/02-ms-odbc-driver.sh-example
@@ -32,6 +32,11 @@ MSODBC_URL="https://packages.microsoft.com/debian/8/prod/pool/main/m/msodbcsql17
 ###
 ### Pre-flight check
 ###
+if [ "${#}" = "1" ]; then
+	if [ "${1}" = "ACCEPT_EULA=1" ]; then
+		ACCEPT_EULA=Y
+	fi
+fi
 if [ "${ACCEPT_EULA}" != "Y" ]; then
 	echo "MS ODBC EULA not accepted. Aborting installation."
 	exit 0

diff --git a/cfg/php-startup-7.3/02-ms-odbc-driver.sh-example b/cfg/php-startup-7.3/02-ms-odbc-driver.sh-example
@@ -32,6 +32,11 @@ MSODBC_URL="https://packages.microsoft.com/debian/8/prod/pool/main/m/msodbcsql17
 ###
 ### Pre-flight check
 ###
+if [ "${#}" = "1" ]; then
+	if [ "${1}" = "ACCEPT_EULA=1" ]; then
+		ACCEPT_EULA=Y
+	fi
+fi
 if [ "${ACCEPT_EULA}" != "Y" ]; then
 	echo "MS ODBC EULA not accepted. Aborting installation."
 	exit 0