From c825dd793789c0df9750b39ca4f94ec7aafe2e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20R?= Date: Sun, 25 Feb 2018 10:52:21 +0100 Subject: [PATCH 1/2] [Docker/Travis] Retry composer install on issues & update docker-compose (#239) --- bin/.travis/trusty/setup_from_external_repo.sh | 4 ++-- bin/.travis/trusty/update_docker.sh | 2 +- doc/docker/install.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/.travis/trusty/setup_from_external_repo.sh b/bin/.travis/trusty/setup_from_external_repo.sh index 86d0df97e..949f79399 100755 --- a/bin/.travis/trusty/setup_from_external_repo.sh +++ b/bin/.travis/trusty/setup_from_external_repo.sh @@ -57,8 +57,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 app/logs/* app/cache/*/* sudo chown -R www-data:www-data app/cache app/logs web/var diff --git a/bin/.travis/trusty/update_docker.sh b/bin/.travis/trusty/update_docker.sh index 062c6e1fe..17b6e4c23 100755 --- a/bin/.travis/trusty/update_docker.sh +++ b/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 diff --git a/doc/docker/install.yml b/doc/docker/install.yml index 97d74b5f9..6836bd7e9 100644 --- a/doc/docker/install.yml +++ b/doc/docker/install.yml @@ -30,7 +30,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 app/console ezplatform:install ${INSTALL_EZ_INSTALL_TYPE}; From fd828033f89a5a560729b231df5c1fb6f25f5bb6 Mon Sep 17 00:00:00 2001 From: Vidar Date: Wed, 28 Feb 2018 10:47:04 +0100 Subject: [PATCH 2/2] Fixed typo (#268) * Fixed typo * fixup! Fixed typo --- .platform.app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.platform.app.yaml b/.platform.app.yaml index 17e043154..ca397ffd6 100644 --- a/.platform.app.yaml +++ b/.platform.app.yaml @@ -81,7 +81,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 app/cache/*/*.* app/console cache:clear # Example of addtional deploy hooks if you use doctrine and/or kaliop migration bundle ##app/console doctrine:migrations:migrate --no-interaction --allow-no-migration