Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch '2.1'
  • Loading branch information
damianz5 committed May 25, 2018
2 parents c5f46c1 + 4ffda93 commit 37df411
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions bin/.travis/trusty/setup_ezplatform.sh
Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions composer.json
Expand Up @@ -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",
Expand All @@ -70,7 +70,7 @@
"symfony/phpunit-bridge": "~3.2"
},
"conflict": {
"symfony/symfony": "3.4.7",
"symfony/symfony": "3.4.9",
"doctrine/dbal": "2.7.0"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions doc/docker/Dockerfile-varnish
Expand Up @@ -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
Expand Down

0 comments on commit 37df411

Please sign in to comment.