Skip to content

Commit e1e711e

Browse files
committed
travis with ubuntu 16.04
1 parent d0ac1e6 commit e1e711e

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

.travis.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
language: php
99

10+
os: linux
11+
dist: xenial
12+
1013
cache:
1114
directories:
1215
- cache
@@ -52,9 +55,17 @@ before_install:
5255
- sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'CREATE DATABASE tests_tmp;' -U postgres; fi"
5356
- sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE IF NOT EXISTS tests_tmp; CREATE DATABASE IF NOT EXISTS tests;'; fi"
5457
- sh -c "if [ '$ENABLE_MONGODB' = 'enable' ]; then mongo mydb_test --eval 'db.createUser({user:"travis",pwd:"test",roles:["readWrite"]});'; fi"
58+
# ubuntu 14.04
5559
# https://docs.docker.com/edge/engine/reference/commandline/dockerd/#daemon-socket-option
56-
- echo 'DOCKER_OPTS="-H unix:///var/run/docker.sock -H tcp://0.0.0.0:2375"' | sudo tee /etc/default/docker
57-
- sudo service docker restart
60+
# - echo 'DOCKER_OPTS="-H unix:///var/run/docker.sock -H tcp://0.0.0.0:2375"' | sudo tee /etc/default/docker
61+
# - sudo service docker restart
62+
# ubuntu 16.04
63+
- sudo mkdir -p /etc/systemd/system/docker.service.d
64+
- echo -e '[Service]\nExecStart=\nExecStart=/usr/bin/dockerd' | sudo tee /etc/systemd/system/docker.service.d/docker.conf
65+
- echo '{"hosts":["unix:///var/run/docker.sock","tcp://0.0.0.0:2375"]}' | sudo tee /etc/docker/daemon.json
66+
- sudo systemctl daemon-reload
67+
- sudo systemctl cat docker
68+
- sudo systemctl restart docker
5869
- sudo curl -fsSL http://get.sensiolabs.org/sami.phar -o /usr/local/bin/sami
5970
- sudo chmod +x /usr/local/bin/sami
6071

tests/Docker/TestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use Docker\Docker;
88

9-
class TestCase extends \PHPUnit\Framework\TestCase
9+
abstract class TestCase extends \PHPUnit\Framework\TestCase
1010
{
1111
const DOCKER_HOST = '127.0.0.1:2375';
1212

0 commit comments

Comments
 (0)