Skip to content

Commit 80fd60a

Browse files
committed
Changing the composer/composer image by the official image much lighter and updated
Minor update of commands related to Composer
1 parent e479945 commit 80fd60a

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ init:
2626
@$(shell cp -n $(shell pwd)/web/app/composer.json.dist $(shell pwd)/web/app/composer.json 2> /dev/null)
2727

2828
apidoc:
29-
@docker exec $(shell docker-compose ps -q php) app/vendor/apigen/apigen/bin/apigen generate -s app/src -d app/doc
29+
@docker exec $(shell docker-compose ps -q php) app/vendor/bin/apigen generate app/src --destination app/doc
3030
@make resetOwner
3131

3232
clean:
@@ -43,7 +43,7 @@ code-sniff:
4343
@docker exec $(shell docker-compose ps -q php) app/vendor/bin/phpcs --standard=PSR2 app/src
4444

4545
composer-up:
46-
@docker run --rm -v $(shell pwd)/web/app:/app composer/composer update
46+
@docker run --rm -v $(shell pwd)/web/app:/app composer update
4747

4848
docker-start: init
4949
@echo "Docker is running..."

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -249,13 +249,13 @@ make help
249249
### Updating PHP dependencies with composer
250250

251251
```sh
252-
sudo docker run --rm -v $(pwd)/web/app:/app composer/composer update
252+
sudo docker run --rm -v $(pwd)/web/app:/app composer update
253253
```
254254

255255
### Generating PHP API documentation
256256

257257
```sh
258-
sudo docker exec $(sudo docker-compose ps -q php) php ./app/vendor/apigen/apigen/bin/apigen generate -s app/src -d app/doc
258+
sudo docker exec $(sudo docker-compose ps -q php) ./app/vendor/bin/apigen generate app/src --destination app/doc
259259
```
260260

261261
### Testing PHP application with PHPUnit

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020
- "./etc/php/php.ini:/usr/local/etc/php/conf.d/php.ini"
2121
- "./web:/var/www/html"
2222
composer:
23-
image: composer/composer
23+
image: "composer"
2424
volumes:
2525
- "./web/app:/app"
2626
command: install

0 commit comments

Comments
 (0)