File tree Expand file tree Collapse file tree 4 files changed +7
-22
lines changed Expand file tree Collapse file tree 4 files changed +7
-22
lines changed Original file line number Diff line number Diff line change @@ -9,24 +9,12 @@ services:
9
9
- docker
10
10
11
11
install :
12
- # Update docker-engine using Ubuntu 'trusty' apt repo
13
- - >
14
- curl -sSL "https://get.docker.com/gpg" |
15
- sudo -E apt-key add -
16
- - >
17
- echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" |
18
- sudo tee -a /etc/apt/sources.list
19
- - sudo apt-get update
20
- - >
21
- sudo apt-get -o Dpkg::Options::="--force-confdef" \
22
- -o Dpkg::Options::="--force-confold" --assume-yes install docker-engine --allow-unauthenticated
23
12
- docker version
24
-
25
- # Update docker-compose via pip
26
13
- sudo pip install docker-compose
27
14
- docker-compose version
28
- - docker-compose up --build -d
29
- - docker ps -a
15
+ - sed -i -e "s/php:cli/php:${TRAVIS_PHP_VERSION}-cli/g" Dockerfile
16
+ - cat Dockerfile
17
+ - docker-compose build
30
18
31
19
script :
32
20
- docker-compose up --exit-code-from php
Original file line number Diff line number Diff line change 1
- FROM php:7.1- cli
1
+ FROM php:cli
2
2
3
3
RUN pecl install xdebug
4
4
@@ -11,4 +11,4 @@ RUN curl -sS https://getcomposer.org/installer | php \
11
11
&& mv composer.phar /usr/local/bin/ \
12
12
&& ln -s /usr/local/bin/composer.phar /usr/local/bin/composer
13
13
14
- ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}"
14
+ ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}"
Original file line number Diff line number Diff line change @@ -6,11 +6,11 @@ services:
6
6
container_name : php
7
7
build :
8
8
context : .
9
- dockerfile : docker/ Dockerfile
9
+ dockerfile : Dockerfile
10
10
volumes :
11
11
- .:/code
12
12
working_dir : /code
13
- command : docker/entrypoint.sh
13
+ command : bash -c "composer install --prefer-source --no-interaction && php ./vendor/bin/phpunit"
14
14
depends_on :
15
15
- mysql
16
16
- mongodb
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments