From f770b606dab89d16c4804e731555f60c392f2f6c Mon Sep 17 00:00:00 2001 From: Marek Nocon Date: Tue, 2 Jul 2019 09:10:09 +0200 Subject: [PATCH 1/2] EZP-30669: Add support for Chromium driver --- php/scripts/docker-entrypoint.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/php/scripts/docker-entrypoint.sh b/php/scripts/docker-entrypoint.sh index 827c81b..02457cf 100755 --- a/php/scripts/docker-entrypoint.sh +++ b/php/scripts/docker-entrypoint.sh @@ -28,7 +28,9 @@ if [ "$BEHAT_SELENIUM_HOST" != "" ] && [ "$BEHAT_WEB_HOST" != "" ]; then logger "Copying behat.yml.dist to behat.yml and updating selenium and web hosts" if [ -f behat.yml.dist ]; then cp -f behat.yml.dist behat.yml + if [ "$MINK_DEFAULT_SESSION" != "" ]; then sed -i "s@javascript_session: selenium@javascript_session: ${MINK_DEFAULT_SESSION}@" behat.yml; fi sed -i "s@localhost:4444@${BEHAT_SELENIUM_HOST}:4444@" behat.yml + if [ "$BEHAT_CHROMIUM_HOST" != "" ]; then sed -i "s@localhost:9222@${BEHAT_CHROMIUM_HOST}:9222@" behat.yml; fi sed -i "s@localhost@${BEHAT_WEB_HOST}@" behat.yml else logger "No behat.yml.dist found, skipping" From 44f2d714d5ec585f792120c13ede0387af0a0994 Mon Sep 17 00:00:00 2001 From: Marek Nocon Date: Tue, 2 Jul 2019 10:30:09 +0200 Subject: [PATCH 2/2] Install Redis 4.3.0 --- php/Dockerfile-5.6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/Dockerfile-5.6 b/php/Dockerfile-5.6 index 9b4e388..13853e6 100644 --- a/php/Dockerfile-5.6 +++ b/php/Dockerfile-5.6 @@ -66,7 +66,7 @@ RUN set -xe \ && docker-php-ext-enable igbinary \ \ # Install redis (manualy build in order to be able to enable igbinary) - && for i in $(seq 1 3); do pecl install -o --nobuild redis && s=0 && break || s=$? && sleep 1; done; (exit $s) \ + && for i in $(seq 1 3); do pecl install -o --nobuild redis-4.3.0 && s=0 && break || s=$? && sleep 1; done; (exit $s) \ && cd "$(pecl config-get temp_dir)/redis" \ && phpize \ && ./configure --enable-redis-igbinary \