From 80fd60aea28b508122640513b082d1949fd036e2 Mon Sep 17 00:00:00 2001
From: Vincent Letourneau <vincent@nanoninja.com>
Date: Thu, 3 Aug 2017 13:33:57 +0200
Subject: [PATCH] Changing the composer/composer image by the official image
 much lighter and updated

Minor update of commands related to Composer
---
 Makefile           | 4 ++--
 README.md          | 4 ++--
 docker-compose.yml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 547400c..9e1b1ad 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ init:
 	@$(shell cp -n $(shell pwd)/web/app/composer.json.dist $(shell pwd)/web/app/composer.json 2> /dev/null)
 
 apidoc:
-	@docker exec $(shell docker-compose ps -q php) app/vendor/apigen/apigen/bin/apigen generate -s app/src -d app/doc
+	@docker exec $(shell docker-compose ps -q php) app/vendor/bin/apigen generate app/src --destination app/doc
 	@make resetOwner
 
 clean:
@@ -43,7 +43,7 @@ code-sniff:
 	@docker exec $(shell docker-compose ps -q php) app/vendor/bin/phpcs --standard=PSR2 app/src
 
 composer-up:
-	@docker run --rm -v $(shell pwd)/web/app:/app composer/composer update
+	@docker run --rm -v $(shell pwd)/web/app:/app composer update
 
 docker-start: init
 	@echo "Docker is running..."
diff --git a/README.md b/README.md
index 43f8436..538a2f0 100644
--- a/README.md
+++ b/README.md
@@ -249,13 +249,13 @@ make help
 ### Updating PHP dependencies with composer
 
 ```sh
-sudo docker run --rm -v $(pwd)/web/app:/app composer/composer update
+sudo docker run --rm -v $(pwd)/web/app:/app composer update
 ```
 
 ### Generating PHP API documentation
 
 ```sh
-sudo docker exec $(sudo docker-compose ps -q php) php ./app/vendor/apigen/apigen/bin/apigen generate -s app/src -d app/doc
+sudo docker exec $(sudo docker-compose ps -q php) ./app/vendor/bin/apigen generate app/src --destination app/doc
 ```
 
 ### Testing PHP application with PHPUnit
diff --git a/docker-compose.yml b/docker-compose.yml
index c024180..f811cf3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,7 +20,7 @@ services:
             - "./etc/php/php.ini:/usr/local/etc/php/conf.d/php.ini"
             - "./web:/var/www/html"
     composer:
-        image: composer/composer
+        image: "composer"
         volumes:
             - "./web/app:/app"
         command: install