Merge pull request #198 from computerfr33k/master

minimize user switching in workspace build.

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)
@@ -50,13 +50,12 @@ It's like Laravel Homestead but for Docker instead of Vagrant.
 		- [Change the PHP-CLI Version](#Change-the-PHP-CLI-Version)
 		- [Install xDebug](#Install-xDebug)
 	- [Misc](#Misc)
-		- [Run a Docker Virtual Host](#Run-Docker-Virtual-Host)
-		- [Find your Docker IP Address](#Find-Docker-IP-Address)
 		- [Use custom Domain](#Use-custom-Domain)
 		- [Enable Global Composer Build Install](#Enable-Global-Composer-Build-Install)
 		- [Install Prestissimo](#Install-Prestissimo)
 		- [Install Node + NVM](#Install-Node)
 		- [Debugging](#debugging)
+		- [Upgrading LaraDock](#upgrading-laradock)
 - [Help & Questions](#Help)
 
 
@@ -71,7 +70,7 @@ It contains pre-packaged Docker Images that provides you a wonderful development
 **Usage Overview:** Run `NGINX`, `MySQL` and `Redis`.
 
 ```shell
-docker-compose up  nginx mysql redis
+docker-compose up nginx mysql redis
 ```
 
 <a name="features"></a>
@@ -93,25 +92,31 @@ docker-compose up  nginx mysql redis
 
 
 <a name="Supported-Containers"></a>
-### Supported Containers
+### Supported Software's (Containers)
 
-- PHP-FPM
-- NGINX
-- HHVM
-- MySQL
-- PostgreSQL
-- MariaDB
-- MongoDB
-- Neo4j
-- Redis
-- Memcached
-- Caddy
-- Beanstalkd
-- Beanstalkd Console
-- Workspace (contains: Composer, PHP7-CLI, Laravel Installer, Git, Node, Gulp, SQLite,  Vim, Nano, cURL...)
+- **Database Engines:**
+	- MySQL
+	- PostgreSQL
+	- MariaDB
+	- MongoDB
+	- Neo4j
+- **Cache Engines:**
+	- Redis
+	- Memcached
+- **PHP Servers:**
+	- NGINX
+	- Apache2
+	- Caddy
+- **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 :)
 
 
 
@@ -153,20 +158,27 @@ Running a virtual Container is much faster than running a full virtual Machine.
 
 
 
-<a name="Requirements"></a>
-## Requirements
 
-| Linux                                                                          | Windows & MAC                                                                                 |
-|--------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------|
-| [Laravel](https://laravel.com/docs/master/installation)                        | [Laravel](https://laravel.com/docs/master/installation)                                       |
-| [Git](https://git-scm.com/downloads)                                           | [Git](https://git-scm.com/downloads)                                                          |
-| [Docker Engine](https://docs.docker.com/engine/installation/linux/ubuntulinux) | [Docker Toolbox](https://www.docker.com/toolbox) OR [Native Docker](https://beta.docker.com/) |
-| [Docker Compose](https://docs.docker.com/compose/install)                      |                                                                                               |
 
 <a name="Demo"></a>
 ## Demo Video
 
-What's better than a [**Demo Video**](https://www.youtube.com/watch?v=-DamFMczwDA) :)
+What's better than a **Demo Video**:
+
+- LaraDock v4.0 (Coming soon..)
+- LaraDock [v2.2](https://www.youtube.com/watch?v=-DamFMczwDA)
+- LaraDock [v0.3](https://www.youtube.com/watch?v=jGkyO6Is_aI)
+- LaraDock [v0.1](https://www.youtube.com/watch?v=3YQsHe6oF80)
+
+
+
+<a name="Requirements"></a>
+## Requirements
+
+- [Git](https://git-scm.com/downloads)                                           
+- [Docker](https://www.docker.com/products/docker/)
+
+
 
 <a name="Installation"></a>
 ## Installation
@@ -193,13 +205,21 @@ git clone https://github.com/LaraDock/laradock.git
 ## Usage
 
 
-1 - For **Windows & MAC** users only: If you are not using the native Docker-Engine `Beta`, make sure you have a running Docker Virtual Host on your machine.
-[How to run a Docker Virtual Host?](#Run-Docker-Virtual-Host)
-(**Linux** users don't need a Virtual Host, so skip this step).
+**Read Before starting:**
+
+If you are using **Docker Toolbox** (VM), do one of the following:
+
+- Upgrade to Docker [Native](https://www.docker.com/products/docker) for Mac/Windows (Recommended). Check out [Upgrading Laradock](#upgrading-laradock)
+- Use LaraDock v3.* (Visit the `LaraDock-ToolBox` [Branch](https://github.com/LaraDock/laradock/tree/LaraDock-ToolBox)).
+
+
+If you are using **Docker Native** (For Mac/Windows) or even for Linux, continue this documentation normally since LaraDock v4 and above is just for that.
+
 
 
 <br>
-2 - Run some Containers: *(Make sure you are in the `laradock` folder before running the `docker-compose` commands).*
+<br>
+1 - Run Containers: *(Make sure you are in the `laradock` folder before running the `docker-compose` commands).*
 
 
 
@@ -209,48 +229,43 @@ 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.
 
 
 
-
-
 <br>
-3 - Enter the Workspace container, to execute commands like (Artisan, Composer, PHPUnit, Gulp, ...).
+2 - Enter the Workspace container, to execute commands like (Artisan, Composer, PHPUnit, Gulp, ...).
 
 ```bash
-docker exec -it {Workspace-Container-Name} bash
+docker-compose exec workspace 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`.
+Add `--user=laradock` (example `docker-compose exec --user=laradock workspace bash`) to have files created as your host's user. (you can change the PUID (User id) and PGID (group id) variables from the `docker-compose.yml`).
 
 
 
 <br>
-4 - Edit the Laravel configurations.
+3 - Edit the Laravel configurations.
 
 If you don't have a Laravel project installed yet, see [How to Install Laravel in a Docker Container](#Install-Laravel).
 
-Open your Laravel's `.env` file and set the `DB_HOST` to your `{Docker-IP}`:
+Open your Laravel's `.env` file and set the `DB_HOST` to your `mysql`:
 
 ```env
-DB_HOST=xxx.xxx.xxx.xxx
+DB_HOST=mysql
 ```
-[How to find my Docker IP Address?](#Find-Docker-IP-Address)
+
 
 
 
 
 <br>
-5 - Open your browser and visit your `{Docker-IP}` address (`http://xxx.xxx.xxx.xxx`).
+4 - Open your browser and visit your localhost address (`http://localhost/`).
 
 
 
@@ -264,8 +279,6 @@ If you need a special support. Contact me, more details in the [Help & Questions
 <a name="Documentation"></a>
 ## Documentation
 
-**Note:** this documentation doesn't cover the Docker Beta *(Native Docker on MAC and Windows)*. However, the commands are very similar. We are planning to cover the Docker Beta soon.
-
 
 <a name="Docker"></a>
 ### [Docker]
@@ -329,8 +342,15 @@ docker-compose down
 2 - enter any container using:
 
 ```bash
-docker exec -it {container-name} bash
+docker-composer exec {container-name} bash
 ```
+
+*Example: enter MySQL container*
+
+```bash
+docker-compose exec mysql bash
+```
+
 3 - to exit a container, type `exit`.
 
 
@@ -382,10 +402,7 @@ example for `mysql` it will be `mysql/Dockerfile`.
 ```bash
 docker-compose build mysql
 ```
-
-*If you find any bug or you have and suggestion that can improve the performance of any image, please consider contributing. Thanks in advance.*
-
-
+More info on Containers rebuilding [here](#Build-Re-build-Containers).
 
 
 
@@ -409,6 +426,7 @@ Optionally you can specify which container to rebuild (instead of rebuilding all
 docker-compose build {container-name}
 ```
 
+You might use the `--no-cache` option if you want full rebuilding (`docker-compose build --no-cache {container-name}`).
 
 
 
@@ -486,6 +504,8 @@ Since the new Laravel application is in the `my-cool-app` folder, we need to rep
 cd my-cool-app
 ```
 
+5 - Go back to the laraDock installation steps to see how to edit the `.env` file.
+
 
 
 <br>
@@ -509,9 +529,12 @@ docker-compose ps
 3 - Enter the Workspace container:
 
 ```bash
-docker exec -it {workspace-container-name} bash
+docker-compose exec workspace bash
 ```
 
+Add `--user=laradock` (example `docker-compose exec --user=laradock workspace bash`) to have files created as your host's user.
+
+
 4 - Run anything you want :)
 
 ```bash
@@ -534,19 +557,19 @@ phpunit
 docker-compose up -d redis
 ```
 
-2 - Open your Laravel's `.env` file and set the `REDIS_HOST` to your `Docker-IP` instead of the default `127.0.0.1` IP.
+2 - Open your Laravel's `.env` file and set the `REDIS_HOST` to `redis`
 
 ```env
-REDIS_HOST=xxx.xxx.xxx.xxx
+REDIS_HOST=redis
 ```
 
-If you don't find the `REDIS_HOST` variable in your `.env` file. Go to the database config file `config/database.php` and replace the default `127.0.0.1` IP with your `Docker-IP` for Redis like this:
+If you don't find the `REDIS_HOST` variable in your `.env` file. Go to the database config file `config/database.php` and replace the default `127.0.0.1` IP with `redis` for Redis like this:
 
 ```php
 'redis' => [
     'cluster' => false,
     'default' => [
-        'host'     => 'xxx.xxx.xxx.xxx',
+        'host'     => 'redis',
         'port'     => 6379,
         'database' => 0,
     ],
@@ -580,15 +603,15 @@ composer require predis/predis:^1.0
 <a name="Use-Mongo"></a>
 ### Use Mongo
 
-1 - First install `mongo` in the Workspace and the PHP-FPM Containers: 
+1 - First install `mongo` in the Workspace and the PHP-FPM Containers:
 <br>
 a) open the `docker-compose.yml` file
 <br>
-b) search for the `INSTALL_MONGO` argument under the Workspace Container 
+b) search for the `INSTALL_MONGO` argument under the Workspace Container
 <br>
 c) set it to `true`
 <br>
-d) search for the `INSTALL_MONGO` argument under the PHP-FPM Container 
+d) search for the `INSTALL_MONGO` argument under the PHP-FPM Container
 <br>
 e) set it to `true`
 
@@ -644,7 +667,7 @@ docker-compose up -d mongo
 
 5 - Open your Laravel's `.env` file and update the following variables:
 
-- set the `DB_HOST` to your `Docker-IP`.
+- set the `DB_HOST` to your `mongo`.
 - set the `DB_PORT` to `27017`.
 - set the `DB_DATABASE` to `database`.
 
@@ -659,7 +682,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 --user=laradock laradock_workspace_1 bash`.
+- Enter the Workspace Container.
 - Migrate the Database `php artisan migrate`.
 
 
@@ -769,15 +792,15 @@ Right now you have to manually edit the `Dockerfile` or create a new one like it
 <a name="Install-xDebug"></a>
 ### Install xDebug
 
-1 - First install `xDebug` in the Workspace and the PHP-FPM Containers: 
+1 - First install `xDebug` in the Workspace and the PHP-FPM Containers:
 <br>
 a) open the `docker-compose.yml` file
 <br>
-b) search for the `INSTALL_XDEBUG` argument under the Workspace Container 
+b) search for the `INSTALL_XDEBUG` argument under the Workspace Container
 <br>
 c) set it to `true`
 <br>
-d) search for the `INSTALL_XDEBUG` argument under the PHP-FPM Container 
+d) search for the `INSTALL_XDEBUG` argument under the PHP-FPM Container
 <br>
 e) set it to `true`
 
@@ -807,92 +830,19 @@ It should be like this:
 ### [Misc]
 
 
-
-
-
-<a name="Run-Docker-Virtual-Host"></a>
-### Run a Docker Virtual Host
-
-These steps are only for **Windows & MAC** users *(Linux users don't need a virtual host)*:
-
-1 - Run the default Host:
-
-```bash
-docker-machine start default
-```
-
-* If the host "default" does not exist, create one using the command below, else skip it:
-
-* ```bash
-  docker-machine create -d virtualbox default
-  ```
-
-2 - Run this command to configure your shell:
-
-```bash
-eval $(docker-machine env)
-```
-
-
-
-
-
-
-
-<br>
-<a name="Find-Docker-IP-Address"></a>
-### Find your Docker IP Address
-
-**On Windows & MAC:**
-
-Run this command in your terminal:
-
-```bash
-docker-machine ip default
-```
-If your Host name is different then `default`, you have to specify it (`docker-machine ip my-host`).
-
-*(The default IP is 192.168.99.100)*
-
-<br>
-
-> **boot2docker** users: run `boot2docker ip` *(when boot2docker is up)*.
-
-<br>
-**On Linux:**
-
-Run this command in your terminal:
-
-```shell
-ifconfig docker0 | grep 'inet' | cut -d: -f2 | awk '{ print $1}' | head -n1
-```
-
-*(The default IP is 172.17.0.1)*
-
-
-
 <br>
 <a name="Use-custom-Domain"></a>
 ### Use custom Domain (instead of the Docker IP)
 
-Assuming your custom domain is `laravel.dev` and your current `Docker-IP` is `xxx.xxx.xxx.xxx`.
+Assuming your custom domain is `laravel.dev`
 
-1 - Open your `/etc/hosts` file and map your `Docker IP` to the `laravel.dev` domain, by adding the following:
+1 - Open your `/etc/hosts` file and map your localhost address `127.0.0.1` to the `laravel.dev` domain, by adding the following:
 
 ```bash
-xxx.xxx.xxx.xxx    laravel.dev
+127.0.0.1    laravel.dev
 ```
 
-2 - Open your Laravel's `.env` file and replace the `127.0.0.1` default values with your `{Docker-IP}`.
-<br>
-Example:
-
-```env
-DB_HOST=xxx.xxx.xxx.xxx
-```
-
-3 - Open your browser and visit `{http://laravel.dev}`
-
+2 - Open your browser and visit `{http://laravel.dev}`
 
 
 Optionally you can define the server name in the nginx config file, like this:
@@ -934,7 +884,7 @@ It should be like this:
 <a name="Install-Prestissimo"></a>
 ### Install Prestissimo
 
-[Prestissimo](https://github.com/hirak/prestissimo) is a plugin for composer which enables parallel install functionality. 
+[Prestissimo](https://github.com/hirak/prestissimo) is a plugin for composer which enables parallel install functionality.
 
 1 - Enable Running Global Composer Install during the Build:
 
@@ -974,6 +924,8 @@ It should be like this:
 
 3 - Re-build the container `docker-compose build workspace`
 
+
+
 <br>
 <a name="debugging"></a>
 ### Debugging
@@ -997,6 +949,30 @@ Use `http://127.0.0.1` (or [your Docker IP](#Find-Docker-IP-Address)) instead of
 Make sure the ports for the services that you are trying to run (80, 3306, etc.) are not being used already by other programs, such as a built in `apache`/`httpd` service or other development tools you have installed.
 
 
+
+
+<br>
+<a name="upgrading-laradock"></a>
+### Upgrading LaraDock
+
+
+Moving from Docker Toolbox (VirtualBox) to Docker Native (for Mac/Windows). Requires upgrading LaraDock from v3.* to v4.*:
+
+1. Stop the docker vm `docker-machine stop {default}`
+2. Install Docker for [Mac](https://docs.docker.com/docker-for-mac/) or [Windows](https://docs.docker.com/docker-for-windows/).
+3. Upgrade LaraDock to `v4.*.*` (`git pull origin master`)
+4. Use LaraDock as you used to do: `docker-compose up -d nginx mysql`.
+
+**Note:** If you face any problem with the last step above: rebuild all your containers 
+`docker-compose build --no-cache`
+"Warnning Containers Data might be lost!"
+
+
+
+
+
+
+
 <br>
 ## Contributing
 
@@ -1006,7 +982,7 @@ This little project was built by one man who has a full time job and many respon
 <a name="Help"></a>
 ## Help & Questions
 
-Join the chat room on [Gitter](https://gitter.im/LaraDock/laradock) and get help and support from the community. 
+Join the chat room on [Gitter](https://gitter.im/LaraDock/laradock) and get help and support from the community.
 
 You can as well can open an [issue](https://github.com/laradock/laradock/issues) on Github (will be labeled as Question) and discuss it with people on [Gitter](https://gitter.im/LaraDock/laradock).
 

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"]

beanstalkd-console/Dockerfile

@@ -7,9 +7,9 @@ RUN apt-get update && apt-get install -y curl
 RUN curl -sL https://github.com/ptrofimov/beanstalk_console/archive/master.tar.gz | tar xvz -C /tmp
 RUN mv /tmp/beanstalk_console-master /source
 
-RUN apt-get remove --purge -y curl &&
-    apt-get autoclean &&
-    apt-get clean &&
+RUN apt-get remove --purge -y curl && \
+    apt-get autoclean && \
+    apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 EXPOSE 2080

docker-compose.yml

@@ -51,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:
@@ -190,12 +207,12 @@ services:
     volumes_data:
         build: ./volumes/data
         volumes:
-            - /var/lib/mysql:/var/lib/mysql
-            - /var/lib/postgres:/var/lib/postgres
-            - /var/lib/mariadb:/var/lib/mariadb
-            - /var/lib/memcached:/var/lib/memcached
-            - /var/lib/redis:/data
-            - /var/lib/neo4j:/var/lib/neo4j/data
-            - /var/lib/mongo:/data/db
+            - ./data/mysql:/var/lib/mysql
+            - ./data/postgres:/var/lib/postgres
+            - ./data/mariadb:/var/lib/mariadb
+            - ./data/memcached:/var/lib/memcached
+            - ./data/redis:/data
+            - ./data/neo4j:/var/lib/neo4j/data
+            - ./data/mongo:/data/db
 
 ### Add more Containers below ###############################

workspace/Dockerfile

@@ -70,17 +70,18 @@ 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
+COPY ./composer.json /home/laradock/.composer/composer.json
 
-# Check if global install need to be runned
+# Make sure that ~/.composer belongs to laradock
+RUN chown -R laradock:laradock /home/laradock/.composer
+USER laradock
+
+# Check if global install need to be ran
 ARG COMPOSER_GLOBAL_INSTALL=true
 ENV COMPOSER_GLOBAL_INSTALL ${COMPOSER_GLOBAL_INSTALL}
 RUN if [ ${COMPOSER_GLOBAL_INSTALL} = true ]; then \