Merge pull request #228 from lialosiu/master

add options INSTALL_ZIP_ARCHIVE to php-fpm

CONTRIBUTING.md

@@ -0,0 +1,130 @@
+
+
+# Contributing to LaraDock
+
+Your contribution is more than welcome. Let's keep LaraDock amazing.
+
+
+### Got a Question or Problem?
+
+If you have questions about how to use LaraDock, please direct your questions to the discussion on [Gitter](https://gitter.im/LaraDock/laradock). If you beleave your question could help others, then consider opening an [Issue](https://github.com/laradock/laradock/issues) (it will be labeled as Question).
+
+### Found an Issue?
+If you find a bug in the source code or a mistake in the documentation, you can help us by
+submitting an [Issue](https://github.com/laradock/laradock/issues). Even better you can submit a Pull Request with a fix.
+
+### Want a Feature?
+You can request a new feature by submitting an [Issue](https://github.com/laradock/laradock/issues) (it will be labeled as Feature Suggestion). If you would like to implement a new feature then consider submitting a Pull Request.
+
+
+## Coding Guidelines
+
+### Support new Software
+
+* Create folder with the software name.
+
+* Add a `Dockerfile`, write your code there.
+
+* You may add additional files in the software folder.
+
+* Add the software to the `docker-compose.yml` file.
+
+* Make sure you follow our commenting style.
+
+* Add the software in the `Readme`.
+
+### Edit existing Software
+
+* Open the software (container) folder.
+
+* Edit the files you want to update.
+
+* **Note:** If you want to edit the base image of the `Workspace` or the `php-fpm` Containers, 
+you need to edit their Dockerfiles from their Github repositories. For more info read their Dockerfiles comment on the LaraDock repository.
+
+* Make sure to update the `Readme` incase you made any changes.
+
+## Issue/PR Submission Guidelines
+
+### Submitting an Issue
+Before you submit your issue search the archive, maybe your question was already answered.
+
+If your issue appears to be a bug, and hasn't been reported, open a new issue.
+Help us to maximize the effort we can spend fixing issues and adding new
+features, by not reporting duplicate issues.
+
+
+
+### Submitting a Pull Request (PR)
+Before you submit your pull request consider the following guidelines:
+
+* Search [GitHub](https://github.com/LaraDock/laradock/pulls) for an open or closed Pull Request that relates to your submission. You don't want to duplicate effort.
+
+* Make your changes in a new git branch:
+
+     ```shell
+     git checkout -b my-fix-branch master
+     ```
+* Commit your changes using a descriptive commit message.
+
+* Push your branch to GitHub:
+
+    ```shell
+    git push origin my-fix-branch
+    ```
+
+* In GitHub, send a pull request to `laradock:master`.
+* If we suggest changes then:
+  * Make the required updates.
+  * Commit your changes to your branch (e.g. `my-fix-branch`).
+  * Push the changes to your GitHub repository (this will update your Pull Request).
+
+> If the PR gets too outdated we may ask you to rebase and force push to update the PR:
+
+```shell
+git rebase master -i
+git push origin my-fix-branch -f
+```
+
+*WARNING. Squashing or reverting commits and forced push thereafter may remove GitHub comments on code that were previously made by you and others in your commits.*
+
+
+
+
+
+
+### After your pull request is merged
+
+After your pull request is merged, you can safely delete your branch and pull the changes
+from the main (upstream) repository:
+
+* Delete the remote branch on GitHub either through the GitHub web UI or your local shell as follows:
+
+    ```shell
+    git push origin --delete my-fix-branch
+    ```
+
+* Check out the master branch:
+
+    ```shell
+    git checkout master -f
+    ```
+
+* Delete the local branch:
+
+    ```shell
+    git branch -D my-fix-branch
+    ```
+
+* Update your master with the latest upstream version:
+
+    ```shell
+    git pull --ff upstream master
+    ```
+
+
+
+
+
+<br>
+### Happy Coding :)

README.md

@@ -67,11 +67,20 @@ LaraDock strives to make the development experience easier.
 It contains pre-packaged Docker Images that provides you a wonderful development environment without requiring you to install PHP, NGINX, MySQL, REDIS, and any other software on your local machine.
 
 
-**Usage Overview:** Run `NGINX`, `MySQL` and `Redis`.
+**Usage Overview:** 
+
+Let's see how easy it is to install `NGINX`, `PHP`, `Composer`, `MySQL` and `Redis`. Then run `Laravel`.
+
+1. Get LaraDock inside your Laravel project: 
+<br>
+`git clone https://github.com/LaraDock/laradock.git`.
+2. Enter the laradock folder and run only these Containers: 
+<br>
+`docker-compose up -d nginx mysql redis`
+3. Open your `.env` file and set `DB_HOST` to `mysql` and `REDIS_HOST` to `redis`.
+4. Open your browser and visit the localhost: `http://localdock`
+
 
-```shell
-docker-compose up nginx mysql redis
-```
 
 <a name="features"></a>
 ### Features
@@ -186,7 +195,7 @@ What's better than a **Demo Video**:
 
 1 - Clone the `LaraDock` repository:
 
-**A)** If you already have a Laravel project, clone this repository on your `Laravel` root direcotry:
+**A)** If you already have a Laravel project, clone this repository on your `Laravel` root directory:
 
 ```bash
 git submodule add https://github.com/LaraDock/laradock.git
@@ -342,7 +351,7 @@ docker-compose down
 2 - enter any container using:
 
 ```bash
-docker-composer exec {container-name} bash
+docker-compose exec {container-name} bash
 ```
 
 *Example: enter MySQL container*
@@ -942,7 +951,7 @@ sudo chmod -R 777 storage bootstrap/cache
 
 #### I see "Welcome to nginx" instead of the Laravel App!
 
-Use `http://127.0.0.1` (or [your Docker IP](#Find-Docker-IP-Address)) instead of `http://localhost` in your browser.
+Use `http://127.0.0.1` instead of `http://localhost` in your browser.
 
 #### I see an error message containing `address already in use`
 
@@ -978,6 +987,7 @@ Moving from Docker Toolbox (VirtualBox) to Docker Native (for Mac/Windows). Requ
 
 This little project was built by one man who has a full time job and many responsibilities, so if you like this project and you find that it needs a bug fix or support for new software or upgrade any container, or anything else.. Do not hesitate to contribute, you are more than welcome :)
 
+#### Read our [Contribution Guidelines](https://github.com/LaraDock/laradock/blob/master/CONTRIBUTING.md)
 
 <a name="Help"></a>
 ## Help & Questions
@@ -996,6 +1006,9 @@ For special help with Docker and/or Laravel, you can schedule a live call with t
 
 **Main Contributors:**
 
+- [Suteepat (tianissimo)](https://github.com/tianissimo)
+- [David (davidavz)](https://github.com/davidavz)
+- [Lialosiu](https://github.com/lialosiu)
 - [Eric Pfeiffer (computerfr33k)](https://github.com/computerfr33k)
 - [Orette](https://github.com/orette)
 - [Jack Fletcher (Kauhat)](https://github.com/Kauhat)

docker-compose.yml

@@ -26,6 +26,7 @@ services:
             args:
                 - INSTALL_MONGO=false
                 - INSTALL_XDEBUG=false
+                - INSTALL_ZIP_ARCHIVE=false
             dockerfile: Dockerfile-70
         volumes_from:
             - volumes_source

php-fpm/Dockerfile-56

@@ -3,8 +3,14 @@
 # Image Setup
 #--------------------------------------------------------------------------
 #
+# To edit the 'php-fpm' base Image, visit its repository on Github
+#    https://github.com/LaraDock/php-fpm
+#
+# To change its version, see the available Tags on the Docker Hub:
+#    https://hub.docker.com/r/laradock/php-fpm/tags/
+#
 
-FROM laradock/php-fpm:5.6--1.0
+FROM laradock/php-fpm:5.6--1.1
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
@@ -29,6 +35,7 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 #
 #   - INSTALL_XDEBUG=           false
 #   - INSTALL_MONGO=            false
+#   - INSTALL_ZIP_ARCHIVE=      false
 #
 
 #####################################
@@ -54,6 +61,18 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
     pecl install mongodb \
 ;fi
 
+#####################################
+# ZipArchive:
+#####################################
+
+ARG INSTALL_ZIP_ARCHIVE=true
+ENV INSTALL_ZIP_ARCHIVE ${INSTALL_ZIP_ARCHIVE}
+RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
+    # Install the zip extention
+    pecl install zip \
+;fi
+
+
 #
 #--------------------------------------------------------------------------
 # Final Touch

php-fpm/Dockerfile-70

@@ -3,8 +3,14 @@
 # Image Setup
 #--------------------------------------------------------------------------
 #
+# To edit the 'php-fpm' base Image, visit its repository on Github
+#    https://github.com/LaraDock/php-fpm
+#
+# To change its version, see the available Tags on the Docker Hub:
+#    https://hub.docker.com/r/laradock/php-fpm/tags/
+#
 
-FROM laradock/php-fpm:7.0--1.0
+FROM laradock/php-fpm:7.0--1.1
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
@@ -29,6 +35,7 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 #
 #   - INSTALL_XDEBUG=           false
 #   - INSTALL_MONGO=            false
+#   - INSTALL_ZIP_ARCHIVE=      false
 #
 
 #####################################
@@ -54,6 +61,18 @@ RUN if [ ${INSTALL_MONGO} = true ]; then \
     pecl install mongodb \
 ;fi
 
+#####################################
+# ZipArchive:
+#####################################
+
+ARG INSTALL_ZIP_ARCHIVE=true
+ENV INSTALL_ZIP_ARCHIVE ${INSTALL_ZIP_ARCHIVE}
+RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
+    # Install the zip extention
+    pecl install zip \
+;fi
+
+
 #
 #--------------------------------------------------------------------------
 # Final Touch

php-fpm/laravel.ini

@@ -2,6 +2,7 @@ date.timezone=UTC
 display_errors=Off
 log_errors=On
 extension=mongodb.so
+extension=zip.so
 
 ; Maximum amount of memory a script may consume (128MB)
 ; http://php.net/memory-limit

workspace/Dockerfile

@@ -3,8 +3,14 @@
 # Image Setup
 #--------------------------------------------------------------------------
 #
+# To edit the 'workspace' base Image, visit its repository on Github
+#    https://github.com/LaraDock/workspace
+#
+# To change its version, see the available Tags on the Docker Hub:
+#    https://hub.docker.com/r/laradock/workspace/tags/
+#
 
-FROM laradock/workspace:1.0
+FROM laradock/workspace:1.1
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
@@ -96,17 +102,11 @@ RUN if [ ${COMPOSER_GLOBAL_INSTALL} = true ]; then \
 # Check if NVM needs to be installed
 ARG INSTALL_NODE=true
 ENV INSTALL_NODE ${INSTALL_NODE}
+ENV NVM_DIR /home/laradock/.nvm
 RUN if [ ${INSTALL_NODE} = true ]; then \
     # Install nvm (A Node Version Manager)
-    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 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=/home/laradock/.nvm \
-    # Install NodeJS with NVM
-    RUN . ~/.nvm/nvm.sh && \
+    curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.3/install.sh | bash && \
+        . ~/.nvm/nvm.sh && \
         nvm install stable && \
         nvm use stable && \
         nvm alias stable && \