From aa6af3b049f608420b46f9b843bc0977764194f8 Mon Sep 17 00:00:00 2001 From: gggeek Date: Mon, 24 Oct 2022 14:10:15 +0000 Subject: [PATCH] one more try --- .../bundle_with_extra_dependencies/.euts.2.3.env | 5 +++-- docker/images/ez/root/build/getphp.sh | 5 +++++ 2 files changed, 8 insertions(+), 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 index d4de2b7..75e818e 100644 --- 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 index 8447ab3..00f0e77 100755 --- 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