Skip to content

Commit 4b917ee

Browse files
committed
Merge branch 'kirtangajjar-update-dc-travis' into develop-v4
2 parents 7f1052f + 5aeb6ea commit 4b917ee

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ env:
88
- PATH="$TRAVIS_BUILD_DIR/vendor/bin:$PATH"
99

1010
before_install:
11+
- sudo curl -L https://github.com/docker/compose/releases/download/1.22.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
1112
- |
1213
# Remove Xdebug for a huge performance increase:
1314
if [ -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini ]; then
@@ -62,3 +63,8 @@ notifications:
6263
email:
6364
on_success: never
6465
on_failure: change
66+
67+
addons:
68+
apt:
69+
packages:
70+
- docker-ce

templates/global_docker_compose.yml.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3'
1+
version: '3.5'
22

33
services:
44

0 commit comments

Comments
 (0)