Merge pull request #189 from docksal/develop

Release 2.11.0
docksal · Jul 1, 2020 · e7b4cf2 · e7b4cf2
2 parents 54d6b69 + 48e9393
commit e7b4cf2
Show file tree

Hide file tree

Showing 50 changed files with 329 additions and 4,215 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,9 +8,9 @@ env:
     - LATEST_VERSION=7.3
     - DOCKSAL_VERSION=develop
   matrix:
-    - VERSION=7.1
     - VERSION=7.2
     - VERSION=7.3
+    - VERSION=7.4
 
 # Skip building master.
 # Stable image tags are pushed during release tag builds so that stable and release tags match on Docker Hub.
@@ -30,7 +30,7 @@ install:
 
 script:
   # Pull the latest edge image to speed up builds (hoping for image layer cache hits)
-  - docker pull ${REPO}:edge-php${VERSION}
+  - docker pull ${REPO}:edge-php${VERSION} || true
   # Build the base image
   - cd ${TRAVIS_BUILD_DIR}/${VERSION}
   - travis_retry make  # Retry builds, as pecl.php.net tends to time out often