Merge branch '3.2'

ezsystems · Jun 24, 2021 · 47d4ac1 · 47d4ac1
2 parents 7ebe402 + 72e3a16
commit 47d4ac1
Show file tree

Hide file tree

Showing 2 changed files with 6 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

diff --git a/composer.json b/composer.json
@@ -90,6 +90,7 @@
     },
     "conflict": {
         "doctrine/persistence": "1.3.2",
+        "lexik/jwt-authentication-bundle": "2.12.0",
         "symfony/framework-bundle": "5.1.0",
         "symfony/symfony": "*"
     },