From 27d41f822f32d2b15ce1dfd1f214c1e81c5ee876 Mon Sep 17 00:00:00 2001
From: Benjamin BOUDIER <benjamin.boudier@idci-consulting.fr>
Date: Mon, 3 Sep 2018 14:36:28 +0200
Subject: [PATCH] Fix: docker stack

---
 .docker/build/php/php.ini |  2 +-
 Makefile                  | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.docker/build/php/php.ini b/.docker/build/php/php.ini
index 5b20be4..c575452 100644
--- a/.docker/build/php/php.ini
+++ b/.docker/build/php/php.ini
@@ -15,5 +15,5 @@ error_reporting = E_ALL;
 log_errors = On;
 display_errors = On;
 error_log = /dev/stderr;
-memory_limit = -1;
+memory_limit = 128M;
 xdebug.overload_var_dump = 0
diff --git a/Makefile b/Makefile
index c1c91ce..c9e3c20 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
 # Variables
 
-target_container ?= php
 php_sources ?= .
 
 # Utils
@@ -10,15 +9,15 @@ vendor: composer.json composer.lock
 
 .PHONY: composer-add-github-token
 composer-add-github-token:
-	docker-compose run --rm $(target_container) composer config --global github-oauth.github.com $(token)
+	docker-compose run --rm php composer config --global github-oauth.github.com $(token)
 
 .PHONY: composer-update
 composer-update:
-	docker-compose run --rm $(target_container) composer update
+	docker-compose run --rm php -d memory_limit=-1 /usr/local/bin/composer update $(options)
 
 .PHONY: composer-install
 composer-install:
-	docker-compose run --rm $(target_container) composer install
+	docker-compose run --rm php composer install $(options)
 
 .PHONY: phploc
 phploc:
@@ -44,8 +43,8 @@ phpcs-fix:
 
 .PHONY: phpunit
 phpunit: vendor ./vendor/bin/phpunit ./phpunit.xml.dist
-	docker-compose run --rm $(target_container) ./vendor/bin/phpunit --coverage-text $(options)
+	docker-compose run --rm php ./vendor/bin/phpunit --coverage-text $(options)
 
 .PHONY: phpunit-functional
 phpunit-functional: vendor ./vendor/bin/phpunit ./phpunit_functional.xml.dist
-	docker-compose run --rm $(target_container) ./vendor/bin/phpunit -c phpunit_functional.xml.dist --coverage-text $(options)
+	docker-compose run --rm php ./vendor/bin/phpunit -c phpunit_functional.xml.dist --coverage-text $(options)