From 43c380043bdec3b0c60ba5783e1e255bd4a10db4 Mon Sep 17 00:00:00 2001
From: Stanislav Shupilkin <sshupilkin@virtuman.com>
Date: Tue, 26 Jun 2018 14:43:12 +0300
Subject: [PATCH] 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 a635826..1047a17 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 5f42d84..4bcc740 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
--
2.18.1