Merge branch 'studio_master' into studio-demo_master

.platform.app.yaml

@@ -100,7 +100,7 @@ hooks:
             touch web/var/.platform.installed
         fi
         # As we are deploying code changes we need to clear any kind of code/system cache
-        rm -f app/cache/*/*
+        rm -Rf var/cache/*/*.*
         bin/console cache:clear
         # Example of addtional deploy hooks if you use doctrine and/or kaliop migration bundle
         ##bin/console doctrine:migrations:migrate --no-interaction --allow-no-migration
@@ -111,7 +111,7 @@ hooks:
 #crons:
 #    symfony:
 #        spec: "*/20 * * * *"
-#        cmd: "php app/console ezpublish:cron:run"
+#        cmd: "php bin/console ezpublish:cron:run"
 
 runtime:
     extensions:

bin/.travis/trusty/setup_from_external_repo.sh

@@ -61,8 +61,8 @@ if [ "$RUN_INSTALL" = "1" ] ; then
     composer require --no-update "$COMPOSER_REQUIRE"
     cat composer.json
   fi
-  echo "> Run composer install"
-  composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader
+  echo "> Run composer install (try 3 times)"
+  for i in $(seq 1 3); do composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader && s=0 && break || s=$? && sleep 1; done; (exit $s)
   mkdir -p web/var
   rm -Rf var/logs/* var/cache/*/*
   sudo chown -R www-data:www-data var web/var

bin/.travis/trusty/update_docker.sh

@@ -12,7 +12,7 @@ docker -v
 
 
 docker-compose -v
-DOCKER_COMPOSE_VERSION="1.14.0"
+DOCKER_COMPOSE_VERSION="1.19.0"
 echo "\nUpdating Docker Compose to ${DOCKER_COMPOSE_VERSION}"
 sudo rm -f /usr/local/bin/docker-compose
 curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose

doc/docker/install.yml

@@ -31,7 +31,7 @@ services:
     # Second chown line:  For dev and behat tests we give a bit extra rights, never do this for prod.
     command: >
       /bin/sh -c "
-      composer install --no-progress --no-interaction --prefer-dist --no-suggest --optimize-autoloader;
+      for i in $$(seq 1 3); do composer install --no-progress --no-interaction --prefer-dist --no-suggest --optimize-autoloader && s=0 && break || s=$$? && sleep 1; done; (exit $$s);
       mkdir -p web/var;
       php /scripts/wait_for_db.php;
       php bin/console ezplatform:install ${INSTALL_EZ_INSTALL_TYPE};