From 903ebb044b43c7d5818168232eddaaaa5b3f29c0 Mon Sep 17 00:00:00 2001 From: Stanislav Shupilkin Date: Tue, 26 Jun 2018 14:30:13 +0300 Subject: [PATCH 1/7] Add arg PHP-VERSION in Dockerfile --- Dockerfile | 4 +++- docker-compose.yml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 03c2ba7e2..4c07c7f5a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ -FROM php:cli +ARG PHP_VERSION + +FROM php:${PHP_VERSION}-cli RUN pecl install xdebug diff --git a/docker-compose.yml b/docker-compose.yml index c1d83dd97..440db55e4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,8 @@ services: volumes: - .:/code working_dir: /code + environment: + PHP_VERSION: ${TRAVIS_PHP_VERSION} command: bash -c "composer install --prefer-source --no-interaction && php ./vendor/bin/phpunit" depends_on: - mysql From e51fe15ab0f0831a2c0ecd44c3e0473f986bcda9 Mon Sep 17 00:00:00 2001 From: Stanislav Shupilkin Date: Tue, 26 Jun 2018 14:33:41 +0300 Subject: [PATCH 2/7] Delete empty row --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 440db55e4..5f42d8469 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,6 @@ version: '3' services: - php: container_name: php build: From 43c380043bdec3b0c60ba5783e1e255bd4a10db4 Mon Sep 17 00:00:00 2001 From: Stanislav Shupilkin Date: Tue, 26 Jun 2018 14:43:12 +0300 Subject: [PATCH 3/7] Add build arg in docker-compose.yml --- .travis.yml | 3 +-- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a6358266b..1047a1734 100644 --- a/.travis.yml +++ b/.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 diff --git a/docker-compose.yml b/docker-compose.yml index 5f42d8469..4bcc740da 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: - .:/code working_dir: /code environment: - PHP_VERSION: ${TRAVIS_PHP_VERSION} + PHP_VERSION: ${PHP_VERSION} command: bash -c "composer install --prefer-source --no-interaction && php ./vendor/bin/phpunit" depends_on: - mysql From e2a91bb71e5f6562df8a88e7edf460e1be71ebbc Mon Sep 17 00:00:00 2001 From: Stanislav Shupilkin Date: Tue, 26 Jun 2018 15:03:43 +0300 Subject: [PATCH 4/7] Add changes to Dcokerfile --- .travis.yml | 2 +- Dockerfile | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1047a1734..fe11b61da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ install: - sudo pip install docker-compose - docker-compose version - cat Dockerfile - - docker-compose build --build-arg PHP_VERSION="${TRAVIS_PHP_VERSION}" + - docker-compose build --build-arg PHP_VERSION=${TRAVIS_PHP_VERSION} script: - docker-compose up --exit-code-from php diff --git a/Dockerfile b/Dockerfile index 4c07c7f5a..a01fc5dc8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,9 @@ 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 \ From 49ec04ddda7bb5dcf696f4ac6b2bf40bd02a3bfd Mon Sep 17 00:00:00 2001 From: Stanislav Shupilkin Date: Tue, 26 Jun 2018 15:27:41 +0300 Subject: [PATCH 5/7] Separate installing vendors by composer use official image of composer --- .travis.yml | 3 +++ docker-compose.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fe11b61da..d4184bad0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,9 @@ php: services: - docker +before_script: + - docker pull composer + - docker run --rm -v $(pwd):/app composer install --prefer-source --no-interaction install: - docker version - sudo pip install docker-compose diff --git a/docker-compose.yml b/docker-compose.yml index 4bcc740da..23f7775ce 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: working_dir: /code environment: PHP_VERSION: ${PHP_VERSION} - command: bash -c "composer install --prefer-source --no-interaction && php ./vendor/bin/phpunit" + command: bash -c "php ./vendor/bin/phpunit" depends_on: - mysql - mongodb From 3bba0ac4d6cd6fb6d233f679a61ef5ad0552dd98 Mon Sep 17 00:00:00 2001 From: Stanislav Shupilkin Date: Tue, 26 Jun 2018 15:47:25 +0300 Subject: [PATCH 6/7] Delete use composer image --- .travis.yml | 3 --- docker-compose.yml | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index d4184bad0..fe11b61da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,6 @@ php: services: - docker -before_script: - - docker pull composer - - docker run --rm -v $(pwd):/app composer install --prefer-source --no-interaction install: - docker version - sudo pip install docker-compose diff --git a/docker-compose.yml b/docker-compose.yml index 23f7775ce..4bcc740da 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: working_dir: /code environment: PHP_VERSION: ${PHP_VERSION} - command: bash -c "php ./vendor/bin/phpunit" + command: bash -c "composer install --prefer-source --no-interaction && php ./vendor/bin/phpunit" depends_on: - mysql - mongodb From d1d06753a6a4eb54c15e8382eb80aa115df7c801 Mon Sep 17 00:00:00 2001 From: Stanislav Shupilkin Date: Wed, 27 Jun 2018 13:18:05 +0300 Subject: [PATCH 7/7] Add default value PHP_VERSION --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4bcc740da..decc0d653 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: - .:/code working_dir: /code environment: - PHP_VERSION: ${PHP_VERSION} + PHP_VERSION: 7.1 command: bash -c "composer install --prefer-source --no-interaction && php ./vendor/bin/phpunit" depends_on: - mysql