diff options
-rw-r--r-- | .travis.yml | 4 | ||||
-rw-r--r-- | docker/php/Dockerfile | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index b8ec3b0..094f851 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,9 +32,9 @@ install: - docker run --rm --volume $PWD:/app --workdir="/app" composer install script: - - docker build --build-arg php_version=${PHP_VERSION} --build-arg libxml_version=${LIBXML_VERSION} -t travis-build - < ./docker/php/Dockerfile + - 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 --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 + - docker run --volume $PWD:/app --workdir="/app" --env TRAVIS=${TRAVIS} --env TRAVIS_JOB_ID=${TRAVIS_JOB_ID} travis-build php ./vendor/php-coveralls/php-coveralls/bin/php-coveralls -v diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index e375ac1..08ee44c 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -1,6 +1,6 @@ -ARG php_version -ARG libxml_version -FROM andreskrey/php-${php_version}-libxml-${libxml_version} +ARG PHP_VERSION +ARG LIBXML_VERSION +FROM andreskrey/php-${PHP_VERSION}-libxml-${LIBXML_VERSION} RUN pecl install xdebug && docker-php-ext-enable xdebug |