Merge pull request #1553 from Smolevich/changes-in-travis-build

Changes in travis build

Author: jenssegers

.travis.yml

@@ -12,9 +12,8 @@ install:
   - docker version
   - sudo pip install docker-compose
   - docker-compose version
-  - sed -i -e "s/php:cli/php:${TRAVIS_PHP_VERSION}-cli/g" Dockerfile
   - cat Dockerfile
-  - docker-compose build
+  - docker-compose build --build-arg PHP_VERSION=${TRAVIS_PHP_VERSION}
 
 script:
   - docker-compose up --exit-code-from php

Dockerfile

@@ -1,10 +1,13 @@
-FROM php:cli
+ARG PHP_VERSION
+
+FROM php:${PHP_VERSION}-cli
 
 RUN pecl install xdebug
 
 RUN apt-get update && \
-    apt-get install -y autoconf pkg-config libssl-dev git && \
-    pecl install mongodb git zlib1g-dev && docker-php-ext-enable mongodb && \
+    apt-get install -y autoconf pkg-config libssl-dev git zlib1g-dev
+
+RUN pecl install mongodb && docker-php-ext-enable mongodb && \
     docker-php-ext-install -j$(nproc) pdo pdo_mysql zip && docker-php-ext-enable xdebug
 
 RUN curl -sS https://getcomposer.org/installer | php \

docker-compose.yml

@@ -1,7 +1,6 @@
 version: '3'
 
 services:
-
     php:
         container_name: php
         build:
@@ -10,6 +9,8 @@ services:
         volumes:
             - .:/code
         working_dir: /code
+        environment:
+          PHP_VERSION: 7.1
         command: bash -c "composer install --prefer-source --no-interaction && php ./vendor/bin/phpunit"
         depends_on:
           - mysql