Merge remote-tracking branch 'origin/1.13' into 2.5

.travis.yml

@@ -82,7 +82,6 @@ before_install:
   - ./bin/.travis/trusty/update_docker.sh
   # Internal auth token dedicated to testing with travis+composer on ezsystems repos, not for reuse!
   - echo "{\"github-oauth\":{\"github.com\":\"d0285ed5c8644f30547572ead2ed897431c1fc09\"}}" > auth.json
-  # Disable XDebug for performance
   - phpenv config-rm xdebug.ini
   # Get latest composer build
   - travis_retry composer selfupdate
@@ -98,14 +97,6 @@ before_script:
   - if [ "${SYMFONY_CMD}" != "" ] ; then docker-compose exec --user www-data app sh -c "bin/console ${SYMFONY_CMD}" ; fi
   - if [ "${SETUP_BEHAT_OPTS}" != "" ] ; then cd "$HOME/build/ezplatform"; docker-compose exec --user www-data app sh -c "bin/ezbehat $SETUP_BEHAT_OPTS" ; fi
   #- docker ps
-  #- docker-compose logs
-
-# Execute test command, need to use sh to get right exit code (docker/compose/issues/3379)
-# Behat will use behat.yml which is a copy of behat.yml.dist with hostnames update by doc/docker/selenium.yml
-script:
-  - if [ "${TEST_CMD}" != "" ] ; then cd "$HOME/build/ezplatform"; docker-compose exec --user www-data app sh -c "$TEST_CMD" ; fi
-  - if [ "${BEHAT_OPTS}" != "" ] ; then cd "$HOME/build/ezplatform"; docker-compose exec --user www-data app sh -c "bin/ezbehat $BEHAT_OPTS" ; fi
-
 
 after_failure:
   # Will show us the last bit of the log of container's main processes

bin/.travis/trusty/setup_from_external_repo.sh

@@ -33,6 +33,11 @@ if [ "$COMPOSE_FILE" = "" ] ; then
     exit 1
 fi
 
+if [[ -n "${DOCKER_PASSWORD}" ]]; then
+    echo "> Set up Docker credentials"
+    echo ${DOCKER_PASSWORD} | docker login -u ${DOCKER_USERNAME} --password-stdin
+fi
+
 echo "> Move '$REPO_DIR' to 'tmp_travis_folder'"
 mv $REPO_DIR tmp_travis_folder
 ls -al tmp_travis_folder