Merge remote-tracking branch 'origin/3.2' into master

ezsystems · Jan 8, 2021 · 0c59003 · 0c59003
2 parents 7f2740d + 23b76ab
commit 0c59003
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.platform/varnish.vcl b/.platform/varnish.vcl
@@ -3,6 +3,7 @@
 //   - Varnish xkey vmod (via varnish-modules package 0.10.2 or higher, or via Varnish Plus)
 // - eZ Platform 3.x or higher with ezplatform-http-cache (this) bundle
 //
+// WARNING: Not for us with Fastly, see documentation for where to find dedicated Fastly VCL.  
 
 // Not applicable on Platform.sh:
 //vcl 4.0;

diff --git a/bin/.travis/trusty/setup_ezplatform.sh b/bin/.travis/trusty/setup_ezplatform.sh
@@ -81,6 +81,11 @@ if [[ -n "${DEPENDENCY_PACKAGE_NAME}" ]]; then
 
 fi
 
+if [[ -n "${DOCKER_PASSWORD}" ]]; then
+    echo "> Set up Docker credentials"
+    echo ${DOCKER_PASSWORD} | docker login -u ${DOCKER_USERNAME} --password-stdin
+fi
+
 echo "> Install DB and dependencies"
 docker-compose -f doc/docker/install-dependencies.yml up --abort-on-container-exit