Refactored web container

Author: mblaschke

docker-compose.yml

@@ -2,10 +2,9 @@
 # Main php container
 #######################################
 main:
-  ## Ubuntu
   build: docker/main
   #dockerfile: Ubuntu-12.04 # Ubuntu 12.04 - PHP 5.3, LTS (precise)
-  dockerfile: Ubuntu-14.04 # Ubuntu 14.04 - PHP 5.5, LTS (trusty)
+  dockerfile: Ubuntu-14.04  # Ubuntu 14.04 - PHP 5.5, LTS (trusty)
   #dockerfile: Ubuntu-15.04 # Ubuntu 15.04 - PHP 5.6 (vivid)
   #dockerfile: Ubuntu-15.10 # Ubuntu 15.10 - PHP 5.6 (wily)
   #dockerfile: Ubuntu-HHVM  # Ubuntu 14.04 - HHVM (trusty)
@@ -35,8 +34,9 @@ main:
 # Webserver
 #######################################
 web:
-  build: docker/web/httpd/   # Apache HTTPD webserver
-  #build: docker/web/nginx/  # Nginx
+  build: docker/web
+  dockerfile: Apache-Httpd # Apache HTTPd
+  #dockerfile: Nginx       # Nginx
   ports:
     - 8000:80
     - 8443:443

docker/web/httpd/Dockerfile renamed to docker/web/Apache-Httpd

@@ -13,9 +13,9 @@ FROM httpd:2.4
 
 RUN apt-get update && apt-get install -y net-tools
 
-ADD conf/vhost.conf /usr/local/apache2/conf/.docker-vhost.conf.original
-ADD ssl/*           /usr/local/apache2/ssl/
-ADD entrypoint.sh   /entrypoint.sh
+ADD conf/httpd/vhost.conf    /usr/local/apache2/conf/.docker-vhost.conf.original
+ADD ssl/*                    /usr/local/apache2/ssl/
+ADD bin/httpd/entrypoint.sh  /entrypoint.sh
 
 EXPOSE 80
 EXPOSE 443

docker/web/nginx/Dockerfile renamed to docker/web/Nginx

@@ -13,9 +13,9 @@ FROM nginx
 
 RUN apt-get update && apt-get install -y net-tools
 
-ADD conf/vhost.conf /opt/docker/vhost.conf
-ADD ssl/*           /etc/nginx/ssl/
-ADD entrypoint.sh   /entrypoint.sh
+ADD conf/nginx/vhost.conf     /opt/docker/vhost.conf
+ADD ssl/*                     /etc/nginx/ssl/
+ADD bin/nginx/entrypoint.sh   /entrypoint.sh
 
 EXPOSE 80
 EXPOSE 8000