one more try

tanoconsulting · Oct 24, 2022 · aa6af3b · aa6af3b
1 parent 4287c26
commit aa6af3b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/doc/config_examples/bundle_with_extra_dependencies/.euts.2.3.env b/doc/config_examples/bundle_with_extra_dependencies/.euts.2.3.env
@@ -2,8 +2,9 @@
 
 # Use a specific project name - always a good idea when you plan to test the same bundle in different configurations
 COMPOSE_PROJECT_NAME=kezmbt_23
-# We use Debian 10 Buster which comes with php 7.3 by default, downgraded to 7.2
-TESTSTACK_DEBIAN_VERSION=buster
+# We use Ubuntu 18 Bionic which comes with php 7.2 by default
+TESTSTACK_OS_VENDOR=ubuntu
+TESTSTACK_DEBIAN_VERSION=bionic
 TESTSTACK_PHP_VERSION=7.2
 
 # Besides the eZ Kernel, our tests require NetgenTagsBundle, EzSystemsEzPlatformXmlTextFieldTypeBundle and EzSystemsMatrixBundle.

diff --git a/docker/images/ez/root/build/getphp.sh b/docker/images/ez/root/build/getphp.sh
@@ -28,6 +28,11 @@ if [ "$2" != norefresh ]; then
     apt-get update
 fi
 
+# a small shortcut to simplify the logic later
+if [ "${PHP_VERSION}" = 5.6 -a "${DEBIAN_VERSION}" = jessie ]; then
+    PHP_VERSION=default
+fi
+
 if [ "${PHP_VERSION}" = default ]; then
     if [ "${DEBIAN_VERSION}" = jessie -o "${DEBIAN_VERSION}" = precise -o "${DEBIAN_VERSION}" = trusty ]; then
         PHPSUFFIX=5