From 9342f0e87e862b006b55f5a35d05cec0369e83fa Mon Sep 17 00:00:00 2001
From: Meritoo <github@meritoo.pl>
Date: Mon, 2 Jul 2018 08:47:56 +0200
Subject: [PATCH] Docker > rename "php-cli" service to "php"

---
 CHANGELOG.md        |  1 +
 docker-compose.yml  |  8 ++++----
 docs/Development.md | 14 +++++++-------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aaf680b..115b085 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ Common and useful classes, methods, exceptions etc.
 # 0.1.0
 
 1. Composer > support/require PHP 5.6+ (instead of 5.5.9+)
+2. Docker > rename `php-cli` service to `php`
 
 # 0.0.21
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 25cf8b9..ef072c8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,9 @@
 version: '3'
 
 services:
-    php-cli:
-        image: ${DOCKER_CONTAINER_OWNER}/${DOCKER_CONTAINER_PROJECT}-php-cli
-        container_name: ${DOCKER_CONTAINER_OWNER}-${DOCKER_CONTAINER_PROJECT}-php-cli
+    php:
+        image: ${DOCKER_CONTAINER_OWNER}/${DOCKER_CONTAINER_PROJECT}-php
+        container_name: ${DOCKER_CONTAINER_OWNER}-${DOCKER_CONTAINER_PROJECT}-php
         entrypoint: php
         command: -S 0.0.0.0:9999
         build:
@@ -13,7 +13,7 @@ services:
         volumes:
             - .:/project
     composer:
-        image: ${DOCKER_CONTAINER_OWNER}/${DOCKER_CONTAINER_PROJECT}-php-cli
+        image: ${DOCKER_CONTAINER_OWNER}/${DOCKER_CONTAINER_PROJECT}-php
         container_name: ${DOCKER_CONTAINER_OWNER}-${DOCKER_CONTAINER_PROJECT}-composer
         entrypoint: composer
         volumes:
diff --git a/docs/Development.md b/docs/Development.md
index 545b3dd..944d334 100644
--- a/docs/Development.md
+++ b/docs/Development.md
@@ -61,13 +61,13 @@ docker-compose run composer remove <vendor>/<package>
 Fix coding standard by running command:
 
 ```bash
-docker-compose exec php-cli php-cs-fixer fix
+docker-compose exec php php-cs-fixer fix
 ```
 
 Omit cache and run the Fixer from scratch by running command:
 
 ```bash
-docker-compose exec php-cli rm .php_cs.cache && docker-compose exec php-cli php-cs-fixer fix
+docker-compose exec php rm .php_cs.cache && docker-compose exec php php-cs-fixer fix
 ```
 
 > [Want more?](https://cs.sensiolabs.org)
@@ -82,17 +82,17 @@ Install required packages by running command: `docker-compose run composer insta
 
 #### Simply & quick, without code coverage
 
-Tests are running using Docker and `php-cli` service defined in `docker-compose.yml`. Example:
+Tests are running using Docker and `php` service defined in `docker-compose.yml`. Example:
 
 ```bash
-docker-compose exec php-cli phpunit --no-coverage
+docker-compose exec php phpunit --no-coverage
 ```
 
 You can also run them in container. In this case you have to run 2 commands:
 1. Enter container:
 
     ```bash
-	docker-compose exec php-cli bash
+	docker-compose exec php bash
     ```
 
 2. Run tests:
@@ -104,7 +104,7 @@ You can also run them in container. In this case you have to run 2 commands:
 #### With code coverage
 
 ```bash
-docker-compose exec php-cli phpunit
+docker-compose exec php phpunit
 ```
 
 # Other
@@ -112,7 +112,7 @@ docker-compose exec php-cli phpunit
 Rebuild project and run tests by running command:
 
 ```bash
-docker-compose exec php-cli phing
+docker-compose exec php phing
 ```
 
 [&lsaquo; Back to `Readme`](../README.md)