From efc23a693d17db55e56f0cbd856b02da845c6618 Mon Sep 17 00:00:00 2001 From: Mahmoud Zalt Date: Fri, 14 Apr 2017 21:02:04 -0400 Subject: [PATCH] add missing workspace tools to the docs --- DOCUMENTATION/config.toml | 2 +- DOCUMENTATION/content/introduction/index.md | 13 +++++++------ docker-compose.yml | 1 - docs/contributing/index.html | 2 +- docs/documentation/index.html | 2 +- docs/getting-started/index.html | 2 +- docs/help/index.html | 2 +- docs/index.html | 15 ++++++++------- docs/index.xml | 13 +++++++------ docs/introduction/index.html | 15 ++++++++------- docs/introduction/index.xml | 13 +++++++------ docs/license/index.html | 2 +- docs/related-projects/index.html | 2 +- env-example | 1 - 14 files changed, 44 insertions(+), 41 deletions(-) diff --git a/DOCUMENTATION/config.toml b/DOCUMENTATION/config.toml index 3d16db58..141ad1dd 100644 --- a/DOCUMENTATION/config.toml +++ b/DOCUMENTATION/config.toml @@ -11,7 +11,7 @@ googleAnalytics = "UA-37514928-9" [params] # General information author = "Mahmoud Zalt" - description = "Laradock documentations." + description = "Full PHP development environment for Docker." copyright = "" # Repository diff --git a/DOCUMENTATION/content/introduction/index.md b/DOCUMENTATION/content/introduction/index.md index 52792c25..0853c7da 100644 --- a/DOCUMENTATION/content/introduction/index.md +++ b/DOCUMENTATION/content/introduction/index.md @@ -38,7 +38,7 @@ cp env-example .env docker-compose up -d nginx mysql redis beanstalkd ``` -3 - Open your project's `.env` file and set the following: +4 - Open your project's `.env` file and set the following: ```shell DB_HOST=mysql @@ -46,7 +46,7 @@ REDIS_HOST=redis QUEUE_HOST=beanstalkd ``` -4 - Open your browser and visit localhost: `http://localhost`. +5 - Open your browser and visit localhost: `http://localhost`. ```shell That's it! enjoy :) @@ -58,14 +58,15 @@ That's it! enjoy :) ## Features -- Easy switch between PHP versions: 7.0, 5.6, 5.5... +- Easy switch between PHP versions: 7.1, 7.0, 5.6... - Choose your favorite database engine: MySQL, Postgres, MariaDB... - Run your own combination of software: Memcached, HHVM, Beanstalkd... - Every software runs on a separate container: PHP-FPM, NGINX, PHP-CLI... - Easy to customize any container, with simple edit to the `Dockerfile`. - All Images extends from an official base Image. (Trusted base Images). -- Pre-configured NGINX for Laravel. -- Easy to apply configurations inside containers. +- Pre-configured NGINX to host any code at your root directory. +- Can use Laradock per project, or single Laradock for all projects. +- Easy to install/remove software's in Containers using environment variables. - Clean and well structured Dockerfiles (`Dockerfile`). - Latest version of the Docker Compose file (`docker-compose`). - Everything is visible and editable. @@ -98,7 +99,7 @@ Laradock introduces the **Workspace** Image, as a development environment. It contains a rich set of helpful tools, all pre-configured to work and integrate with almost any combination of Containers and tools you may choose. **Workspace Image Tools** -PHP CLI - Composer - Git - Linuxbrew - Node - Gulp - SQLite - xDebug - Envoy - Deployer - Vim - Yarn... +PHP CLI - Composer - Git - Linuxbrew - Node - V8JS - Gulp - SQLite - xDebug - Envoy - Deployer - Vim - Yarn - SOAP - Drush... You can choose, which tools to install in your workspace container and other containers, from the `.env` file. diff --git a/docker-compose.yml b/docker-compose.yml index eb175614..6e275707 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,6 @@ services: - INSTALL_DEPLOYER=${WORKSPACE_INSTALL_DEPLOYER} - INSTALL_LINUXBREW=${WORKSPACE_INSTALL_LINUXBREW} - INSTALL_MC=${WORKSPACE_INSTALL_MC} - - INSTALL_SYMFONY=${WORKSPACE_INSTALL_SYMFONY} - PUID=${WORKSPACE_PUID} - PGID=${WORKSPACE_PGID} - NODE_VERSION=${WORKSPACE_NODE_VERSION} diff --git a/docs/contributing/index.html b/docs/contributing/index.html index 1b3f8c0d..9974ffe4 100644 --- a/docs/contributing/index.html +++ b/docs/contributing/index.html @@ -13,7 +13,7 @@ - + diff --git a/docs/documentation/index.html b/docs/documentation/index.html index fc9bdddd..104a9f49 100644 --- a/docs/documentation/index.html +++ b/docs/documentation/index.html @@ -13,7 +13,7 @@ - + diff --git a/docs/getting-started/index.html b/docs/getting-started/index.html index b55b250d..0ec90ee0 100644 --- a/docs/getting-started/index.html +++ b/docs/getting-started/index.html @@ -13,7 +13,7 @@ - + diff --git a/docs/help/index.html b/docs/help/index.html index 42201f3d..65beb98f 100644 --- a/docs/help/index.html +++ b/docs/help/index.html @@ -13,7 +13,7 @@ - + diff --git a/docs/index.html b/docs/index.html index 5f30a360..57d50362 100644 --- a/docs/index.html +++ b/docs/index.html @@ -13,7 +13,7 @@ - + @@ -363,14 +363,14 @@ 
docker-compose up -d nginx mysql redis beanstalkd
-

3 - Open your project’s .env file and set the following:

+

4 - Open your project’s .env file and set the following:

DB_HOST=mysql
 REDIS_HOST=redis
 QUEUE_HOST=beanstalkd
-

4 - Open your browser and visit localhost: http://localhost.

+

5 - Open your browser and visit localhost: http://localhost.

That's it! enjoy :)
@@ -380,14 +380,15 @@ QUEUE_HOST=beanstalkd

Features