improving php README.md

3 files changed, 44 insertions, 47 deletions

diff --git a/Services/php/Dockerfile b/Services/php/Dockerfile
index ee02d89..51085e9 100644
--- a/Services/php/Dockerfile
+++ b/Services/php/Dockerfile
@@ -24,7 +24,6 @@ RUN rm -f $APP_PATH/Dockerfile $APP_PATH/httpd.conf $APP_PATH/run.sh && \
     chown -R apache:apache $APP_PATH $LOG_PATH && \
     chmod ug+r -R $APP_PATH
 
-EXPOSE 80
-EXPOSE 443
+EXPOSE 80 443
 VOLUME [$APP_PATH,$LOG_PATH]
 CMD ["/bin/run.sh"]
\ No newline at end of file
diff --git a/Services/php/README.md b/Services/php/README.md
index 858a923..6aa51ad 100644
--- a/Services/php/README.md
+++ b/Services/php/README.md
@@ -1,46 +1,46 @@
 <!--[metadata]>
 +++
-title = "STARTX Docker Services Images : APACHE"
-description = "Docker container with apache service based on latest fedora"
-keywords = ["home, docker, startx, apache, fedora, centos, repository, container, swarm, compose"]
+title = "STARTX Docker Services Images : APACHE + PHP"
+description = "Docker container with apache + php service based on latest fedora"
+keywords = ["home, docker, startx, apache, php, fedora, centos, repository, container, swarm, compose"]
 weight=3
 +++
 <![end-metadata]-->
 
-# Docker OS Images : APACHE
+# Docker OS Images : APACHE + PHP
 
-Simple and lightweight (120Mo) container used to deliver static http content include all apache's modules but no external languages engines (like php). For dynamic content, you should use our [sv-php service container](https://hub.docker.com/r/startx/sv-php)
-Run [apache httpd daemon](https://httpd.apache.org/) under a container based on [startx/fedora container](https://hub.docker.com/r/startx/fedora)
+Simple and lightweight (145Mo) container used to deliver dynamic http content using apache associated with PHP engine
+Run [PHP engine](https://www.php.net) under a container based on [startx/sv-apache container](https://hub.docker.com/r/startx/sv-apache)
 
-| [![Build Status](https://travis-ci.org/startxfr/docker-images.svg)](https://travis-ci.org/startxfr/docker-images) | [Dockerhub Registry](https://hub.docker.com/r/startx/sv-apache/) | [Sources](https://github.com/startxfr/docker-images/Services/apache)             | [STARTX Profile](https://github.com/startxfr) | 
-|-------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------|----------------------------------------------------------------------------------|-----------------------------------------------|
+| [![Build Status](https://travis-ci.org/startxfr/docker-images.svg)](https://travis-ci.org/startxfr/docker-images) | [Dockerhub Registry](https://hub.docker.com/r/startx/sv-php/) | [Sources](https://github.com/startxfr/docker-images/Services/php)             | [STARTX Profile](https://github.com/startxfr) | 
+|-------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------|-------------------------------------------------------------------------------|-----------------------------------------------|
 
 ## Available flavours
 
-* `:latest` : Fedora core 23 + Apache 
-* `:fc23` : Fedora core 23 + Apache 
-* `:fc22` : Fedora core 22 + Apache 
-* `:fc21` : Fedora core 21 + Apache 
-* `:centos7` : CentOS 7 + Apache 
-* `:centos6` : Centos 6 + Apache 
+* `:latest` : Fedora core 23 + Apache + PHP 
+* `:fc23` : Fedora core 23 + Apache + PHP 
+* `:fc22` : Fedora core 22 + Apache + PHP 
+* `:fc21` : Fedora core 21 + Apache + PHP 
+* `:centos7` : CentOS 7 + Apache + PHP 
+* `:centos6` : Centos 6 + Apache + PHP 
 
 ## Running from dockerhub registry
 
-* with `docker` you can run `docker run -it --name="sv-apache" startx/sv-apache` from any docker host
+* with `docker` you can run `docker run -it --name="sv-php" startx/sv-php` from any docker host
 * with `docker-compose` you can create a docker-compose.yml file with the following content
 ```
 service:
-  image: startx/sv-apache:latest
-  container_name: "sv-apache"
+  image: startx/sv-php:latest
+  container_name: "sv-php"
   environment:
     CONTAINER_TYPE: "service"
-    CONTAINER_SERVICE: "apache"
-    CONTAINER_INSTANCE: "service-apache"
+    CONTAINER_SERVICE: "php"
+    CONTAINER_INSTANCE: "service-php"
     SERVER_NAME: "localhost"
-    DOC_ROOT: "/data/apache"
+    DOC_ROOT: "/data/apache_php"
   volumes:
-    - "/tmp/container/logs/apache:/data/logs/apache"
-    - "/tmp/container/apache:/data/apache"
+    - "/tmp/container/logs/php:/data/logs/apache_php"
+    - "/tmp/container/php:/data/apache_php"
 ```
 
 ## Docker-compose in various situations
@@ -48,20 +48,20 @@ service:
 * sample docker-compose.yml linked to host port 1000
 ```
 service:
-  image: startx/sv-apache:latest
-  container_name: "sv-apache"
+  image: startx/sv-php:latest
+  container_name: "sv-php"
   environment:
-    CONTAINER_INSTANCE: "service-apache"
+    CONTAINER_INSTANCE: "service-php"
   ports:
     - "1000:80"
 ```
 * sample docker-compose.yml with port exposed only to linked services
 ```
 service:
-  image: startx/sv-apache:latest
-  container_name: "sv-apache"
+  image: startx/sv-php:latest
+  container_name: "sv-php"
   environment:
-    CONTAINER_INSTANCE: "service-apache"
+    CONTAINER_INSTANCE: "service-php"
   expose:
     - "80"
 ```
@@ -69,14 +69,14 @@ service:
 ```
 data:
   image: startx/fedora:latest
-  container_name: "sv-apache-data"
+  container_name: "sv-php-data"
   environment:
-    CONTAINER_INSTANCE: "service-apache-data"
+    CONTAINER_INSTANCE: "service-php-data"
 service:
-  image: startx/sv-apache:latest
-  container_name: "sv-apache"
+  image: startx/sv-php:latest
+  container_name: "sv-php"
   environment:
-    CONTAINER_INSTANCE: "service-apache"
+    CONTAINER_INSTANCE: "service-php"
   volume_from:
     - data:rw
 ```
@@ -85,7 +85,7 @@ service:
 
 You can use this Dockerfile template to start a new personalized container based on this container. Create a file named Dockerfile in your project directory and copy this content inside. See [docker guide](http://docs.docker.com/engine/reference/builder/) for instructions on how to use this file.
  ```
-FROM startx/sv-apache:latest
+FROM startx/sv-php:latest
 #... your container specifications
 CMD ["/bin/run.sh"]
 ```
@@ -100,8 +100,8 @@ CMD ["/bin/run.sh"]
 | SERVER_NAME               | `string` | `no`      | Server name for this container. If no name localhost will be assigned
 | HOSTNAME                  | `auto`   | `auto`    | Container unique id automatically assigned by docker daemon at startup
 | DOC_ROOT                  | `auto`   | `auto`    | document root, will use the $APP_PATH variable
-| LOG_PATH                  | `auto`   | `auto`    | default set to /data/logs/apache and used as a volume mountpoint
-| APP_PATH                  | `auto`   | `auto`    | default set to /data/apache and used as a volume mountpoint
+| LOG_PATH                  | `auto`   | `auto`    | default set to /data/logs/apache_php and used as a volume mountpoint
+| APP_PATH                  | `auto`   | `auto`    | default set to /data/apache_php and used as a volume mountpoint
 
 ## Exposed port
 
@@ -114,8 +114,8 @@ CMD ["/bin/run.sh"]
 
 | Container directory  | Description                                                              |
 |----------------------|--------------------------------------------------------------------------|
-| /data/logs/apache    | log directory used to record container and apache logs
-| /data/apache         | data directory served by apache. If empty will be filled with app on startup. In other case use content from mountpoint or data volumes
+| /data/logs/apache_php    | log directory used to record container and php logs
+| /data/apache_php         | data directory served by php. If empty will be filled with app on startup. In other case use content from mountpoint or data volumes
 
 ## Testing the service
 
@@ -133,16 +133,16 @@ You must have a working environment with the source code of this repository. Rea
 
 ### Build & run a container using `docker`
 
-1. Jump into the container directory with `cd Services/apache`
-2. Build the container using `docker build -t sv-apache .`
+1. Jump into the container directory with `cd Services/php`
+2. Build the container using `docker build -t sv-php .`
 3. Run this container 
-  1. Interactively with `docker run -p 80:80 -v /data/logs/apache -it sv-apache`. If you add a second parameter (like `/bin/bash`) to will run this command instead of the default entrypoint. Usefull to interact with this container (ex: `/bin/bash`, `/bin/ps -a`, `/bin/df -h`,...) 
-  2. As a daemon with `docker run -p 80:80 -v /data/logs/apache -d sv-apache`
+  1. Interactively with `docker run -p 80:80 -v /data/logs/apache_php -it sv-php`. If you add a second parameter (like `/bin/bash`) to will run this command instead of the default entrypoint. Usefull to interact with this container (ex: `/bin/bash`, `/bin/ps -a`, `/bin/df -h`,...) 
+  2. As a daemon with `docker run -p 80:80 -v /data/logs/apache_php -d sv-php`
 
 
 ### Build & run a container using `docker-compose`
 
-1. Jump into the container directory with `cd Services/apache`
+1. Jump into the container directory with `cd Services/php`
 2. Run this container 
   1. Interactively with `docker-compose up` Startup logs appears and escaping this command stop the container
   2. As a daemon with `docker-compose up -d`. Container startup logs can be read using `docker-compose logs`
diff --git a/Services/php/read b/Services/php/read
deleted file mode 100644
index 3cd6763..0000000
--- a/Services/php/read
+++ /dev/null
@@ -1,2 +0,0 @@
-Server version: Apache/2.4.16 (Fedora)
-Server built:   Jul 17 2015 08:02:56