From b3f582d6aa14600f95203d5e71089ee664e04153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Tue, 8 May 2018 10:34:56 +0200 Subject: [PATCH 1/4] Update symfony conflicting version (#292) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3a6c39c3..c05aa7f0 100644 --- a/composer.json +++ b/composer.json @@ -64,7 +64,7 @@ "symfony/phpunit-bridge": "~3.2" }, "conflict": { - "symfony/symfony": "3.4.7", + "symfony/symfony": "3.4.9", "doctrine/dbal": "2.7.0" }, "scripts": { From 259be48a995152041a5f71f82bb0e686ac913dc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Tue, 8 May 2018 14:21:24 +0200 Subject: [PATCH 2/4] EZP-29107: Allow overwriting some variables from .env (#287) * EZP-29107: Allow overwriting some variables from .env * EZP-29107: Review amendments --- bin/.travis/trusty/setup_ezplatform.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/.travis/trusty/setup_ezplatform.sh b/bin/.travis/trusty/setup_ezplatform.sh index 0a2f8eb2..62963c9c 100755 --- a/bin/.travis/trusty/setup_ezplatform.sh +++ b/bin/.travis/trusty/setup_ezplatform.sh @@ -14,18 +14,18 @@ # Determine eZ Platform Build dir as relative to current script path EZPLATFORM_BUILD_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../../.." && pwd )" -# Source .env first to make sure we don't override any variables -. ${EZPLATFORM_BUILD_DIR}/.env - DEPENDENCY_PACKAGE_DIR=$3 if [[ -z "${1}" ]]; then - COMPOSE_FILE=$COMPOSE_FILE + # If not set, read default from .env file + export $(grep "COMPOSE_FILE" ${EZPLATFORM_BUILD_DIR}/.env) else COMPOSE_FILE=$1 fi if [[ -z "${2}" ]]; then + # If not set, read default from .env file + export $(grep "INSTALL_EZ_INSTALL_TYPE" ${EZPLATFORM_BUILD_DIR}/.env) INSTALL_TYPE=$INSTALL_EZ_INSTALL_TYPE else INSTALL_TYPE=$2 From 5dbfb10bc960b678cce621d6337aa8c6242c01fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20R?= Date: Sun, 20 May 2018 13:51:49 +0200 Subject: [PATCH 3/4] [Docker] Bump Varnish version to 6.0 for testing (#290) --- doc/docker/Dockerfile-varnish | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/docker/Dockerfile-varnish b/doc/docker/Dockerfile-varnish index 50ea0e81..53699dec 100644 --- a/doc/docker/Dockerfile-varnish +++ b/doc/docker/Dockerfile-varnish @@ -3,8 +3,8 @@ FROM debian:stretch-slim ENV VARNISH_MALLOC_SIZE="256M" \ DEBIAN_FRONTEND=noninteractive -ARG PACKAGECLOUD_URL=https://packagecloud.io/install/repositories/varnishcache/varnish5/script.deb.sh -ARG VARNISH_MODULES_VERSION=0.12.1 +ARG PACKAGECLOUD_URL=https://packagecloud.io/install/repositories/varnishcache/varnish60/script.deb.sh +ARG VARNISH_MODULES_VERSION=0.15.0 # Use official packages from Varnish and build with varnish-modules mainly for xkey # see: https://github.com/varnish/varnish-modules/tree/master/docs From 7290a0a663cbd86bf8512c7fd6df3ff1483ef2ea Mon Sep 17 00:00:00 2001 From: Jacek Foremski Date: Mon, 21 May 2018 10:20:59 +0200 Subject: [PATCH 4/4] [composer] Set proper dependencies for 2.1.x series (#294) --- composer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index c05aa7f0..8993b5cb 100644 --- a/composer.json +++ b/composer.json @@ -35,15 +35,15 @@ "doctrine/orm": "^2.5", "sensio/distribution-bundle": "^5.0.19", "incenteev/composer-parameter-handler": "~2.1", - "ezsystems/ezpublish-kernel": "^7.1@dev", - "ezsystems/repository-forms": "^2.1@dev", - "ezsystems/ezplatform-solr-search-engine": "^1.5@dev", - "ezsystems/ez-support-tools": "^0.2@dev", - "ezsystems/ezplatform-http-cache": "~0.6@dev", - "ezsystems/ezplatform-admin-ui": "^1.1@dev", - "ezsystems/ezplatform-admin-ui-modules": "^1.1@dev", - "ezsystems/ezplatform-admin-ui-assets": "^2.0@dev", - "ezsystems/ezplatform-design-engine": "^1.1", + "ezsystems/ezpublish-kernel": "~7.1.0@dev", + "ezsystems/repository-forms": "~2.1.0@dev", + "ezsystems/ezplatform-solr-search-engine": "~1.5.0@dev", + "ezsystems/ez-support-tools": "~0.2.0@dev", + "ezsystems/ezplatform-http-cache": "~0.6.0@dev", + "ezsystems/ezplatform-admin-ui": "~1.1.0@dev", + "ezsystems/ezplatform-admin-ui-modules": "~1.1.0@dev", + "ezsystems/ezplatform-admin-ui-assets": "~2.0.0@dev", + "ezsystems/ezplatform-design-engine": "~1.1.0", "knplabs/knp-menu-bundle": "^2.1", "willdurand/js-translation-bundle": "^2.6.4", "friendsofsymfony/jsrouting-bundle": "^1.4",