add apache to the readme

Add Apache2 Container

README.md

@@ -19,7 +19,7 @@ It's like Laravel Homestead but for Docker instead of Vagrant.
 
 - [Intro](#Intro)
 	- [Features](#features)
-	- [Supported Containers](#Supported-Containers)
+	- [Supported Software's](#Supported-Containers)
 	- [What is Docker](#what-is-docker)
 	- [What is Laravel](#what-is-laravel)
 	- [Why Docker not Vagrant](#why-docker-not-vagrant)
@@ -88,29 +88,36 @@ docker-compose up  nginx mysql redis
 - Clean and well structured Dockerfiles (`dockerfile`).
 - Latest version of the Docker Compose file (`docker-compose`).
 - Everything is visible and editable.
+- Fast Images Builds.
 - More to come every week..
 
 
 <a name="Supported-Containers"></a>
-### Supported Containers
+### Supported Software's (Containers)
 
-- PHP-FPM (7.0 - 5.6 - 5.5)
-- NGINX
-- HHVM
+- **Database Engines:**
 	- MySQL
 	- PostgreSQL
 	- MariaDB
 	- MongoDB
 	- Neo4j
+- **Cache Engines:**
 	- Redis
 	- Memcached
+- **PHP Servers:**
+	- NGINX
+	- Apache2
 	- Caddy
-- Beanstalkd
-- Beanstalkd Console
-- Workspace (contains: Composer, PHP7-CLI, Laravel Installer, Git, Node, Gulp, Bower, SQLite,  Vim, Nano, cURL and much more)
+- **PHP Compilers:**
+	- PHP-FPM
+	- HHVM
+- **Message Queueing Systems:**
+	- Beanstalkd (+ Beanstalkd Console)
+- **Tools:**
+	- Workspace (PHP7-CLI, Composer, Git, Node, Gulp, SQLite, Vim, Nano, cURL...)
 
 
->If you can't find your container, build it yourself and add it to this list. Contributions are welcomed :)
+>If you can't find your Software, build it yourself and add it to this list. Contributions are welcomed :)
 
 
 
@@ -208,9 +215,9 @@ git clone https://github.com/LaraDock/laradock.git
 docker-compose up -d  nginx mysql
 ```
 
-You can select your own combination of container form this list:
+You can select your own combination of Containers form the list below:
 
-`nginx`, `hhvm` ,`mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `memcached`, `beanstalkd`, `beanstalkd-console`, `caddy`, `workspace`, `php-fpm`.
+`nginx`, `hhvm`, `php-fpm`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `apache2`, `caddy`, `memcached`, `beanstalkd`, `beanstalkd-console`, `workspace`.
 
 
 **Note**: `workspace` and `php-fpm` will run automatically in most of the cases, so no need to specify them in the `up` command.
@@ -226,6 +233,8 @@ You can select your own combination of container form this list:
 docker exec -it {Workspace-Container-Name} bash
 ```
 Replace `{Workspace-Container-Name}` with your Workspace container name.
+<br />
+Add `--user=laradock` to have files created as your host's user. (don't forget to change the PUID (User id) and PGID (group id) variables in docker-compose.yml).
 <br>
 To find the containers names type `docker-compose ps`.
 
@@ -656,7 +665,7 @@ More details about this [here](https://github.com/jenssegers/laravel-mongodb#ins
 7 - Test it:
 
 - First let your Models extend from the Mongo Eloquent Model. Check the [documentation](https://github.com/jenssegers/laravel-mongodb#eloquent).
-- Enter the Workspace Container `docker exec -it laradock_workspace_1 bash`.
+- Enter the Workspace Container `docker exec -it --user=laradock laradock_workspace_1 bash`.
 - Migrate the Database `php artisan migrate`.
 
 
@@ -703,7 +712,7 @@ By default **PHP-FPM 7.0** is running.
 
 2 - Search for `Dockerfile-70` in the PHP container section.
 
-3 - Change the version number, by replacing `Dockerfile-70` with `Dockerfile-5`, like this:
+3 - Change the version number, by replacing `Dockerfile-70` with `Dockerfile-56`, like this:
 
 ```txt
 php-fpm:
@@ -718,30 +727,27 @@ php-fpm:
 docker-compose build php
 ```
 
+> For more details about the PHP base image, visit the [official PHP docker images](https://hub.docker.com/_/php/).
+
+
 #### B) Switch from PHP `7.0` or `5.6` to PHP `5.5`
 
-1 - Follow the steps of (Switch from PHP `7.0` to PHP `5.6`) except the last one "rebuilding container".
+We do not natively support PHP 5.5 anymore, but you can get it in few steps:
 
-2 - Open the `docker-compose.yml` again and make sure you are using `Dockerfile-5` like this:
+1 - Clone `https://github.com/LaraDock/php-fpm`.
 
-```txt
-php-fpm:
-    build:
-        context: ./php-fpm
-        dockerfile: Dockerfile-5
-```
+3 - Rename `Dockerfile-56` to `Dockerfile-55`.
 
-3 - Open `php-fpm/Dockerfile-5` file and on the first line replace the PHP version from (`FROM php:5.6-fpm`) to (`FROM php:5.5-fpm`).
+3 - Edit the file `FROM php:5.6-fpm` to `FROM php:5.5-fpm`.
 
-4 - Now you can rebuild the container
+4 - Build an image from `Dockerfile-55`.
+
+5 - Open the `docker-compose.yml` file.
+
+6 - Point `php-fpm` to your `Dockerfile-55` file.
 
-```bash
-docker-compose build php
-```
 
-<br>
 
-For more details about the PHP base image, visit the [official PHP docker images](https://hub.docker.com/_/php/).
 
 
 

apache2/Dockerfile

@@ -0,0 +1,17 @@
+FROM webdevops/apache:ubuntu-16.04
+
+MAINTAINER Eric Pfeiffer <computerfr33k@users.noreply.github.com>
+
+ARG PHP_SOCKET="php-fpm:9000"
+
+ENV WEB_PHP_SOCKET=$PHP_SOCKET
+
+ENV WEB_DOCUMENT_ROOT=/var/www/laravel/public
+
+EXPOSE 80 443
+
+WORKDIR /var/www/laravel/public
+
+ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"]
+
+CMD ["supervisord"]

docker-compose.yml

@@ -12,6 +12,8 @@ services:
                 - INSTALL_XDEBUG=false
                 - INSTALL_NODE=false
                 - COMPOSER_GLOBAL_INSTALL=false
+                - PUID=1000
+                - PGID=1000
         volumes_from:
             - volumes_source
         tty: true
@@ -49,6 +51,23 @@ services:
         links:
             - php-fpm
 
+### Apache Server Container ##################################
+
+    apache2:
+        build:
+            context: ./apache2
+            args:
+                - PHP_SOCKET="php-fpm:9000"
+        volumes_from:
+            - volumes_source
+        volumes:
+            - ./logs/apache2:/var/log/apache2
+        ports:
+            - "80:80"
+            - "443:443"
+        links:
+            - php-fpm
+
 ### HHVM Container ##########################################
 
     hhvm:

php-fpm/Dockerfile-56

@@ -4,65 +4,32 @@
 #--------------------------------------------------------------------------
 #
 
-FROM php:5.6-fpm
+FROM laradock/php-fpm:5.6--1.0
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
-ADD ./laravel.ini /usr/local/etc/php/conf.d
-ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
+#
+#--------------------------------------------------------------------------
+# Mandatory Software's Installation
+#--------------------------------------------------------------------------
+#
+# Mandatory Software's such as ("mcrypt", "pdo_mysql", "libssl-dev", ....)
+# are installed on the base image 'laradock/php-fpm' image. If you want
+# to add more Software's or remove existing one, you need to edit the
+# base image (https://github.com/LaraDock/php-fpm).
+#
 
 #
 #--------------------------------------------------------------------------
-# Software's Installation
+# Optional Software's Installation
 #--------------------------------------------------------------------------
 #
-# Installing tools and PHP extentions using "apt", "docker-php", "pecl",
+# Optional Software's will only be installed if you set them to `true`
+# in the `docker-compose.yml` before the build.
+#
+#   - INSTALL_XDEBUG=           false
+#   - INSTALL_MONGO=            false
 #
-
-# Install "curl", "libmemcached-dev", "libpq-dev", "libjpeg-dev",
-#         "libpng12-dev", "libfreetype6-dev", "libssl-dev", "libmcrypt-dev",
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-        curl \
-        libmemcached-dev \
-        libz-dev \
-        libpq-dev \
-        libjpeg-dev \
-        libpng12-dev \
-        libfreetype6-dev \
-        libssl-dev \
-        libmcrypt-dev
-
-# Install the PHP mcrypt extention
-RUN docker-php-ext-install mcrypt
-
-# Install the PHP pdo_mysql extention
-RUN docker-php-ext-install pdo_mysql
-
-# Install the PHP pdo_pgsql extention
-RUN docker-php-ext-install pdo_pgsql
-
-#####################################
-# gd:
-#####################################
-
-# Install the PHP gd library
-RUN docker-php-ext-install gd && \
-    docker-php-ext-configure gd \
-        --enable-gd-native-ttf \
-        --with-jpeg-dir=/usr/lib \
-        --with-freetype-dir=/usr/include/freetype2
-
-#####################################
-# MongoDB:
-#####################################
-
-ARG INSTALL_MONGO=true
-ENV INSTALL_MONGO ${INSTALL_MONGO}
-RUN if [ ${INSTALL_MONGO} = true ]; then \
-    # Install the mongodb extention
-    pecl install mongodb \
-;fi
 
 #####################################
 # xDebug:
@@ -76,6 +43,16 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
     docker-php-ext-enable xdebug \
 ;fi
 
+#####################################
+# MongoDB:
+#####################################
+
+ARG INSTALL_MONGO=true
+ENV INSTALL_MONGO ${INSTALL_MONGO}
+RUN if [ ${INSTALL_MONGO} = true ]; then \
+    # Install the mongodb extention
+    pecl install mongodb \
+;fi
 
 #
 #--------------------------------------------------------------------------
@@ -83,6 +60,9 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
 #--------------------------------------------------------------------------
 #
 
+ADD ./laravel.ini /usr/local/etc/php/conf.d
+ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
+
 RUN rm -r /var/lib/apt/lists/*
 
 RUN usermod -u 1000 www-data

php-fpm/Dockerfile-70

@@ -4,65 +4,32 @@
 #--------------------------------------------------------------------------
 #
 
-FROM php:7.0-fpm
+FROM laradock/php-fpm:7.0--1.0
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
-ADD ./laravel.ini /usr/local/etc/php/conf.d
-ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
+#
+#--------------------------------------------------------------------------
+# Mandatory Software's Installation
+#--------------------------------------------------------------------------
+#
+# Mandatory Software's such as ("mcrypt", "pdo_mysql", "libssl-dev", ....)
+# are installed on the base image 'laradock/php-fpm' image. If you want
+# to add more Software's or remove existing one, you need to edit the
+# base image (https://github.com/LaraDock/php-fpm).
+#
 
 #
 #--------------------------------------------------------------------------
-# Software's Installation
+# Optional Software's Installation
 #--------------------------------------------------------------------------
 #
-# Installing tools and PHP extentions using "apt", "docker-php", "pecl",
+# Optional Software's will only be installed if you set them to `true`
+# in the `docker-compose.yml` before the build.
+#
+#   - INSTALL_XDEBUG=           false
+#   - INSTALL_MONGO=            false
 #
-
-# Install "curl", "libmemcached-dev", "libpq-dev", "libjpeg-dev",
-#         "libpng12-dev", "libfreetype6-dev", "libssl-dev", "libmcrypt-dev",
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-        curl \
-        libmemcached-dev \
-        libz-dev \
-        libpq-dev \
-        libjpeg-dev \
-        libpng12-dev \
-        libfreetype6-dev \
-        libssl-dev \
-        libmcrypt-dev
-
-# Install the PHP mcrypt extention
-RUN docker-php-ext-install mcrypt
-
-# Install the PHP pdo_mysql extention
-RUN docker-php-ext-install pdo_mysql
-
-# Install the PHP pdo_pgsql extention
-RUN docker-php-ext-install pdo_pgsql
-
-#####################################
-# gd:
-#####################################
-
-# Install the PHP gd library
-RUN docker-php-ext-install gd && \
-    docker-php-ext-configure gd \
-        --enable-gd-native-ttf \
-        --with-jpeg-dir=/usr/lib \
-        --with-freetype-dir=/usr/include/freetype2
-
-#####################################
-# MongoDB:
-#####################################
-
-ARG INSTALL_MONGO=true
-ENV INSTALL_MONGO ${INSTALL_MONGO}
-RUN if [ ${INSTALL_MONGO} = true ]; then \
-    # Install the mongodb extention
-    pecl install mongodb \
-;fi
 
 #####################################
 # xDebug:
@@ -77,23 +44,15 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
 ;fi
 
 #####################################
-# Memcached:
+# MongoDB:
 #####################################
 
-# Install the memcached extention
-RUN curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-memcached/archive/php7.tar.gz" \
-    && mkdir -p memcached \
-    && tar -C memcached -zxvf /tmp/memcached.tar.gz --strip 1 \
-    && ( \
-        cd memcached \
-        && phpize \
-        && ./configure \
-        && make -j$(nproc) \
-        && make install \
-    ) \
-    && rm -r memcached \
-    && rm /tmp/memcached.tar.gz \
-    && docker-php-ext-enable memcached
+ARG INSTALL_MONGO=true
+ENV INSTALL_MONGO ${INSTALL_MONGO}
+RUN if [ ${INSTALL_MONGO} = true ]; then \
+    # Install the mongodb extention
+    pecl install mongodb \
+;fi
 
 #
 #--------------------------------------------------------------------------
@@ -101,6 +60,9 @@ RUN curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-m
 #--------------------------------------------------------------------------
 #
 
+ADD ./laravel.ini /usr/local/etc/php/conf.d
+ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
+
 RUN rm -r /var/lib/apt/lists/*
 
 RUN usermod -u 1000 www-data

workspace/Dockerfile

@@ -4,94 +4,34 @@
 #--------------------------------------------------------------------------
 #
 
-FROM phusion/baseimage:latest
+FROM laradock/workspace:1.0
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
-RUN DEBIAN_FRONTEND=noninteractive
-RUN locale-gen en_US.UTF-8
-
-ENV LANGUAGE=en_US.UTF-8
-ENV LC_ALL=en_US.UTF-8
-ENV LC_CTYPE=UTF-8
-ENV LANG=en_US.UTF-8
-ENV TERM xterm
-
-# Add the "PHP 7" ppa
-RUN apt-get install -y software-properties-common && \
-    add-apt-repository -y ppa:ondrej/php
+#
+#--------------------------------------------------------------------------
+# Mandatory Software's Installation
+#--------------------------------------------------------------------------
+#
+# Mandatory Software's such as ("php7.0-cli", "git", "vim", ....) are
+# installed on the base image 'laradock/workspace' image. If you want
+# to add more Software's or remove existing one, you need to edit the
+# base image (https://github.com/LaraDock/workspace).
+#
 
 #
 #--------------------------------------------------------------------------
-# Software's Installation
+# Optional Software's Installation
 #--------------------------------------------------------------------------
 #
-
-# Install "PHP Extentions", "libraries", "Software's"
-RUN apt-get update && \
-    apt-get install -y --force-yes \
-        php7.0-cli \
-        php7.0-common \
-        php7.0-curl \
-        php7.0-json \
-        php7.0-xml \
-        php7.0-mbstring \
-        php7.0-mcrypt \
-        php7.0-mysql \
-        php7.0-pgsql \
-        php7.0-sqlite \
-        php7.0-sqlite3 \
-        php7.0-zip \
-        php7.0-memcached \
-        php7.0-gd \
-        pkg-config \
-        php-dev \
-        libcurl4-openssl-dev \
-        libedit-dev \
-        libssl-dev \
-        libxml2-dev \
-        xz-utils \
-        libsqlite3-dev \
-        sqlite3 \
-        git \
-        curl \
-        vim \
-        nano \
-    && apt-get clean
-
-#####################################
-# Composer:
-#####################################
-
-# Install composer and add its bin to the PATH.
-RUN curl -s http://getcomposer.org/installer | php && \
-    echo "export PATH=${PATH}:/var/www/laravel/vendor/bin" >> ~/.bashrc && \
-    mv composer.phar /usr/local/bin/composer
-
-# Add the composer.json
-ADD ./composer.json /root/.composer/composer.json
-
-# Check if global install need to be runned
-ARG COMPOSER_GLOBAL_INSTALL=true
-ENV COMPOSER_GLOBAL_INSTALL ${COMPOSER_GLOBAL_INSTALL}
-RUN if [ ${COMPOSER_GLOBAL_INSTALL} = true ]; then \
-    # run the install
-    composer global install \
-;fi
-
-
-#####################################
-# MongoDB:
-#####################################
-
-# Check if Mongo needs to be installed
-ARG INSTALL_MONGO=true
-ENV INSTALL_MONGO ${INSTALL_MONGO}
-RUN if [ ${INSTALL_MONGO} = true ]; then \
-    # Install the mongodb extension
-    pecl install mongodb && \
-    echo "extension=mongodb.so" >> /etc/php/7.0/cli/php.ini \
-;fi
+# Optional Software's will only be installed if you set them to `true`
+# in the `docker-compose.yml` before the build.
+#
+#   - INSTALL_XDEBUG=           false
+#   - INSTALL_MONGO=            false
+#   - COMPOSER_GLOBAL_INSTALL=  false
+#   - INSTALL_NODE=             false
+#
 
 #####################################
 # xDebug:
@@ -107,6 +47,47 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
     echo "alias phpunit='php -dzend_extension=xdebug.so /var/www/laravel/vendor/bin/phpunit'" >> ~/.bashrc \
 ;fi
 
+#####################################
+# MongoDB:
+#####################################
+
+# Check if Mongo needs to be installed
+ARG INSTALL_MONGO=true
+ENV INSTALL_MONGO ${INSTALL_MONGO}
+RUN if [ ${INSTALL_MONGO} = true ]; then \
+    # Install the mongodb extension
+    pecl install mongodb && \
+    echo "extension=mongodb.so" >> /etc/php/7.0/cli/php.ini \
+;fi
+
+#####################################
+# Non-Root User:
+#####################################
+
+# Add a non-root user to prevent files being created with root permissions on host machine.
+ARG PUID=1000
+ARG PGID=1000
+RUN groupadd -g $PGID laradock && \
+    useradd -u $PUID -g laradock -m laradock
+    
+# Now switch to our laradock user for the rest of user setup
+USER laradock
+
+#####################################
+# Composer:
+#####################################
+
+# Add the composer.json
+ADD ./composer.json /home/laradock/.composer/composer.json
+
+# Check if global install need to be runned
+ARG COMPOSER_GLOBAL_INSTALL=true
+ENV COMPOSER_GLOBAL_INSTALL ${COMPOSER_GLOBAL_INSTALL}
+RUN if [ ${COMPOSER_GLOBAL_INSTALL} = true ]; then \
+    # run the install
+    composer global install \
+;fi
+
 #####################################
 # Node / NVM:
 #####################################
@@ -116,13 +97,13 @@ ARG INSTALL_NODE=true
 ENV INSTALL_NODE ${INSTALL_NODE}
 RUN if [ ${INSTALL_NODE} = true ]; then \
     # Install nvm (A Node Version Manager)
-    curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.1/install.sh | bash \
+    curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.3/install.sh | bash \
 ;fi
 # Again check if NVM needs to be installed
-# I had to split this condifiton link this because when I get it inside the above if statment is refuses to work!
+# I had to split this condition link this because when I get it inside the above if statement is refuses to work!
 ENV if [ ${INSTALL_NODE} = true ]; then \
     # Set the ENV
-    NVM_DIR=/root/.nvm \
+    NVM_DIR=/home/laradock/.nvm \
     # Install NodeJS with NVM
     RUN . ~/.nvm/nvm.sh && \
         nvm install stable && \
@@ -131,18 +112,24 @@ ENV if [ ${INSTALL_NODE} = true ]; then \
         npm install -g gulp bower \
 ;fi
 
+# Wouldn't execute when added to the RUN statement in the above block
+# Source NVM when loading bash since ~/.profile isn't loaded on non-login shell
+RUN if [ ${INSTALL_NODE} = true ]; then \
+    echo "" >> ~/.bashrc && \
+    echo 'export NVM_DIR="$HOME/.nvm"' >> ~/.bashrc && \
+    echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm' >> ~/.bashrc \
+;fi
+
 #
 #--------------------------------------------------------------------------
 # Final Touch
 #--------------------------------------------------------------------------
 #
 
-# Source the bash
-RUN . ~/.bashrc
-
 # Clean up
+USER root
 RUN apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+# Set default work directory
 WORKDIR /var/www/laravel
-