Merge remote-tracking branch 'ezplatform-ee/2.5' into 3.2

ezsystems · Jun 24, 2021 · b7ff315 · b7ff315
2 parents f557170 + 600231b
commit b7ff315
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/bin/.travis/trusty/setup_from_external_repo.sh b/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