diff options
-rw-r--r-- | .travis.yml | 9 | ||||
-rw-r--r-- | docker/php-7.0/Dockerfile | 2 | ||||
-rw-r--r-- | docker/php-7.1/Dockerfile | 2 | ||||
-rw-r--r-- | docker/php-7.2/Dockerfile | 2 | ||||
-rw-r--r-- | docker/php-7.3/Dockerfile | 2 | ||||
-rw-r--r-- | docker/php/Dockerfile | 5 |
6 files changed, 10 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index 921755c..b8ec3b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,11 +29,12 @@ env: - PHP_VERSION=7.0 LIBXML_VERSION=2.9.4 install: - - docker run --rm --volume $PWD:/app composer install + - docker run --rm --volume $PWD:/app --workdir="/app" composer install script: - - docker run --rm --volume $PWD:/app andreskrey/php-${PHP_VERSION}-libxml-${LIBXML_VERSION} php /app/vendor/bin/phpunit --coverage-clover /app/test/clover.xml + - docker build --build-arg php_version=${PHP_VERSION} --build-arg libxml_version=${LIBXML_VERSION} -t travis-build - < ./docker/php/Dockerfile + - docker run --volume $PWD:/app --workdir="/app" travis-build php ./vendor/bin/phpunit --coverage-clover /app/test/clover.xml after_script: - - docker run --rm --volume $PWD:/app composer require php-coveralls/php-coveralls:^2.0 - - php ./vendor/php-coveralls/php-coveralls/bin/php-coveralls -v + - docker run --volume $PWD:/app --workdir="/app" composer require php-coveralls/php-coveralls:^2.0 + - docker run --volume $PWD:/app --workdir="/app" travis-build php ./vendor/php-coveralls/php-coveralls/bin/php-coveralls -v diff --git a/docker/php-7.0/Dockerfile b/docker/php-7.0/Dockerfile deleted file mode 100644 index c7574a1..0000000 --- a/docker/php-7.0/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM php:7.0-cli -RUN pecl install xdebug && docker-php-ext-enable xdebug
\ No newline at end of file diff --git a/docker/php-7.1/Dockerfile b/docker/php-7.1/Dockerfile deleted file mode 100644 index e4cf46e..0000000 --- a/docker/php-7.1/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM php:7.1-cli -RUN pecl install xdebug && docker-php-ext-enable xdebug
\ No newline at end of file diff --git a/docker/php-7.2/Dockerfile b/docker/php-7.2/Dockerfile deleted file mode 100644 index 6b796f6..0000000 --- a/docker/php-7.2/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM php:7.2-cli -RUN pecl install xdebug && docker-php-ext-enable xdebug
\ No newline at end of file diff --git a/docker/php-7.3/Dockerfile b/docker/php-7.3/Dockerfile deleted file mode 100644 index 1350e97..0000000 --- a/docker/php-7.3/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM php:7.3-cli -RUN pecl install xdebug && docker-php-ext-enable xdebug
\ No newline at end of file diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile new file mode 100644 index 0000000..4706d88 --- /dev/null +++ b/docker/php/Dockerfile @@ -0,0 +1,5 @@ +ARG php_version +ARG libxml_version +FROM andreskrey:php-${php_version}-libxml-${libxml_version} + +RUN pecl install xdebug && docker-php-ext-enable xdebug |