浏览代码

add missing containers to the docs

Mahmoud Zalt 8 年之前
父节点
当前提交
1235304a0d

+ 1 - 3
DOCUMENTATION/content/getting-started/index.md

@@ -166,9 +166,7 @@ docker-compose up -d nginx mysql
 **Note**: The `workspace` and `php-fpm` will run automatically in most of the cases, so no need to specify them in the `up` command. If you couldn't find them running then you need specify them as follow: `docker-compose up -d nginx php-fpm mysql workspace`.
 
 
-You can select your own combination of containers form the list below:
-
-> `nginx`, `hhvm`, `php-fpm`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `apache2`, `caddy`, `memcached`, `beanstalkd`, `beanstalkd-console`, `rabbitmq`, `beanstalkd-console`, `workspace`, `phpmyadmin`, `adminer`, `aerospike`, `pgadmin`, `elasticsearch`, `rethinkdb`, `postgres-postgis`, `certbot`, `mailhog`, `minio` and more...!
+You can select your own combination of containers form [this list](http://laradock.io/introduction/#supported-software-images).
 
 *(Please note that sometimes we forget to update the docs, so check the `docker-compose.yml` file to see an updated list of all available containers).*
 

+ 3 - 3
DOCUMENTATION/content/introduction/index.md

@@ -82,7 +82,7 @@ In adhering to the separation of concerns principle as promoted by Docker, Larad
 You can turn On/Off as many instances of as any container without worrying about the configurations, everything works like a charm.
 
 - **Database Engines:**
-MySQL - MariaDB - MongoDB - Neo4j - RethinkDB - PostgreSQL - Postgres Postgis.
+MySQL - MariaDB - MongoDB - Neo4j - RethinkDB - MSSQL - PostgreSQL - Postgres Postgis.
 - **Cache Engines:**
 Redis - Memcached - Aerospike
 - **PHP Servers:**
@@ -90,9 +90,9 @@ NGINX - Apache2 - Caddy
 - **PHP Compilers:**
 PHP FPM - HHVM
 - **Message Queuing:**
-Beanstalkd - Beanstalkd Console - RabbitMQ - RabbitMQ Console
+Beanstalkd - Beanstalkd Console - RabbitMQ - RabbitMQ Console - PHP Worker
 - **Tools:**
-PhpMyAdmin - Adminer - PgAdmin - ElasticSearch - Selenium - Certbot - Mailhog - Minio...
+HAProxy - Jenkins - ElasticSearch - Selenium - Certbot - Mailhog - Minio - Varnish - PhpMyAdmin - Adminer - PgAdmin - MailHog...
 
 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.

+ 1 - 5
docs/getting-started/index.html

@@ -499,11 +499,7 @@
 
 <p><strong>Note</strong>: The <code>workspace</code> and <code>php-fpm</code> will run automatically in most of the cases, so no need to specify them in the <code>up</code> command. If you couldn&rsquo;t find them running then you need specify them as follow: <code>docker-compose up -d nginx php-fpm mysql workspace</code>.</p>
 
-<p>You can select your own combination of containers form the list below:</p>
-
-<blockquote>
-<p><code>nginx</code>, <code>hhvm</code>, <code>php-fpm</code>, <code>mysql</code>, <code>redis</code>, <code>postgres</code>, <code>mariadb</code>, <code>neo4j</code>, <code>mongo</code>, <code>apache2</code>, <code>caddy</code>, <code>memcached</code>, <code>beanstalkd</code>, <code>beanstalkd-console</code>, <code>rabbitmq</code>, <code>beanstalkd-console</code>, <code>workspace</code>, <code>phpmyadmin</code>, <code>adminer</code>, <code>aerospike</code>, <code>pgadmin</code>, <code>elasticsearch</code>, <code>rethinkdb</code>, <code>postgres-postgis</code>, <code>certbot</code>, <code>mailhog</code>, <code>minio</code> and more&hellip;!</p>
-</blockquote>
+<p>You can select your own combination of containers form <a href="http://laradock.io/introduction/#supported-software-images">this list</a>.</p>
 
 <p><em>(Please note that sometimes we forget to update the docs, so check the <code>docker-compose.yml</code> file to see an updated list of all available containers).</em></p>
 

+ 1 - 5
docs/getting-started/index.xml

@@ -180,11 +180,7 @@
 
 &lt;p&gt;&lt;strong&gt;Note&lt;/strong&gt;: The &lt;code&gt;workspace&lt;/code&gt; and &lt;code&gt;php-fpm&lt;/code&gt; will run automatically in most of the cases, so no need to specify them in the &lt;code&gt;up&lt;/code&gt; command. If you couldn&amp;rsquo;t find them running then you need specify them as follow: &lt;code&gt;docker-compose up -d nginx php-fpm mysql workspace&lt;/code&gt;.&lt;/p&gt;
 
-&lt;p&gt;You can select your own combination of containers form the list below:&lt;/p&gt;
-
-&lt;blockquote&gt;
-&lt;p&gt;&lt;code&gt;nginx&lt;/code&gt;, &lt;code&gt;hhvm&lt;/code&gt;, &lt;code&gt;php-fpm&lt;/code&gt;, &lt;code&gt;mysql&lt;/code&gt;, &lt;code&gt;redis&lt;/code&gt;, &lt;code&gt;postgres&lt;/code&gt;, &lt;code&gt;mariadb&lt;/code&gt;, &lt;code&gt;neo4j&lt;/code&gt;, &lt;code&gt;mongo&lt;/code&gt;, &lt;code&gt;apache2&lt;/code&gt;, &lt;code&gt;caddy&lt;/code&gt;, &lt;code&gt;memcached&lt;/code&gt;, &lt;code&gt;beanstalkd&lt;/code&gt;, &lt;code&gt;beanstalkd-console&lt;/code&gt;, &lt;code&gt;rabbitmq&lt;/code&gt;, &lt;code&gt;beanstalkd-console&lt;/code&gt;, &lt;code&gt;workspace&lt;/code&gt;, &lt;code&gt;phpmyadmin&lt;/code&gt;, &lt;code&gt;adminer&lt;/code&gt;, &lt;code&gt;aerospike&lt;/code&gt;, &lt;code&gt;pgadmin&lt;/code&gt;, &lt;code&gt;elasticsearch&lt;/code&gt;, &lt;code&gt;rethinkdb&lt;/code&gt;, &lt;code&gt;postgres-postgis&lt;/code&gt;, &lt;code&gt;certbot&lt;/code&gt;, &lt;code&gt;mailhog&lt;/code&gt;, &lt;code&gt;minio&lt;/code&gt; and more&amp;hellip;!&lt;/p&gt;
-&lt;/blockquote&gt;
+&lt;p&gt;You can select your own combination of containers form &lt;a href=&#34;http://laradock.io/introduction/#supported-software-images&#34;&gt;this list&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;&lt;em&gt;(Please note that sometimes we forget to update the docs, so check the &lt;code&gt;docker-compose.yml&lt;/code&gt; file to see an updated list of all available containers).&lt;/em&gt;&lt;/p&gt;
 

二进制
docs/images/colors.png


二进制
docs/images/screen.png


+ 4 - 8
docs/index.html

@@ -404,7 +404,7 @@ You can turn On/Off as many instances of as any container without worrying about
 
 <ul>
 <li><strong>Database Engines:</strong>
-MySQL - MariaDB - MongoDB - Neo4j - RethinkDB - PostgreSQL - Postgres Postgis.</li>
+MySQL - MariaDB - MongoDB - Neo4j - RethinkDB - MSSQL - PostgreSQL - Postgres Postgis.</li>
 <li><strong>Cache Engines:</strong>
 Redis - Memcached - Aerospike</li>
 <li><strong>PHP Servers:</strong>
@@ -412,9 +412,9 @@ NGINX - Apache2 - Caddy</li>
 <li><strong>PHP Compilers:</strong>
 PHP FPM - HHVM</li>
 <li><strong>Message Queuing:</strong>
-Beanstalkd - Beanstalkd Console - RabbitMQ - RabbitMQ Console</li>
+Beanstalkd - Beanstalkd Console - RabbitMQ - RabbitMQ Console - PHP Worker</li>
 <li><strong>Tools:</strong>
-PhpMyAdmin - Adminer - PgAdmin - ElasticSearch - Selenium - Certbot - Mailhog - Minio&hellip;</li>
+HAProxy - Jenkins - ElasticSearch - Selenium - Certbot - Mailhog - Minio - Varnish - PhpMyAdmin - Adminer - PgAdmin - MailHog&hellip;</li>
 </ul>
 
 <p>Laradock introduces the <strong>Workspace</strong> Image, as a development environment.
@@ -640,11 +640,7 @@ PHP CLI - Composer - Git - Linuxbrew - Node - Gulp - SQLite - xDebug - Envoy - D
 
 <p><strong>Note</strong>: The <code>workspace</code> and <code>php-fpm</code> will run automatically in most of the cases, so no need to specify them in the <code>up</code> command. If you couldn&rsquo;t find them running then you need specify them as follow: <code>docker-compose up -d nginx php-fpm mysql workspace</code>.</p>
 
-<p>You can select your own combination of containers form the list below:</p>
-
-<blockquote>
-<p><code>nginx</code>, <code>hhvm</code>, <code>php-fpm</code>, <code>mysql</code>, <code>redis</code>, <code>postgres</code>, <code>mariadb</code>, <code>neo4j</code>, <code>mongo</code>, <code>apache2</code>, <code>caddy</code>, <code>memcached</code>, <code>beanstalkd</code>, <code>beanstalkd-console</code>, <code>rabbitmq</code>, <code>beanstalkd-console</code>, <code>workspace</code>, <code>phpmyadmin</code>, <code>adminer</code>, <code>aerospike</code>, <code>pgadmin</code>, <code>elasticsearch</code>, <code>rethinkdb</code>, <code>postgres-postgis</code>, <code>certbot</code>, <code>mailhog</code>, <code>minio</code> and more&hellip;!</p>
-</blockquote>
+<p>You can select your own combination of containers form <a href="http://laradock.io/introduction/#supported-software-images">this list</a>.</p>
 
 <p><em>(Please note that sometimes we forget to update the docs, so check the <code>docker-compose.yml</code> file to see an updated list of all available containers).</em></p>
 

+ 4 - 8
docs/index.xml

@@ -84,7 +84,7 @@ You can turn On/Off as many instances of as any container without worrying about
 
 &lt;ul&gt;
 &lt;li&gt;&lt;strong&gt;Database Engines:&lt;/strong&gt;
-MySQL - MariaDB - MongoDB - Neo4j - RethinkDB - PostgreSQL - Postgres Postgis.&lt;/li&gt;
+MySQL - MariaDB - MongoDB - Neo4j - RethinkDB - MSSQL - PostgreSQL - Postgres Postgis.&lt;/li&gt;
 &lt;li&gt;&lt;strong&gt;Cache Engines:&lt;/strong&gt;
 Redis - Memcached - Aerospike&lt;/li&gt;
 &lt;li&gt;&lt;strong&gt;PHP Servers:&lt;/strong&gt;
@@ -92,9 +92,9 @@ NGINX - Apache2 - Caddy&lt;/li&gt;
 &lt;li&gt;&lt;strong&gt;PHP Compilers:&lt;/strong&gt;
 PHP FPM - HHVM&lt;/li&gt;
 &lt;li&gt;&lt;strong&gt;Message Queuing:&lt;/strong&gt;
-Beanstalkd - Beanstalkd Console - RabbitMQ - RabbitMQ Console&lt;/li&gt;
+Beanstalkd - Beanstalkd Console - RabbitMQ - RabbitMQ Console - PHP Worker&lt;/li&gt;
 &lt;li&gt;&lt;strong&gt;Tools:&lt;/strong&gt;
-PhpMyAdmin - Adminer - PgAdmin - ElasticSearch - Selenium - Certbot - Mailhog - Minio&amp;hellip;&lt;/li&gt;
+HAProxy - Jenkins - ElasticSearch - Selenium - Certbot - Mailhog - Minio - Varnish - PhpMyAdmin - Adminer - PgAdmin - MailHog&amp;hellip;&lt;/li&gt;
 &lt;/ul&gt;
 
 &lt;p&gt;Laradock introduces the &lt;strong&gt;Workspace&lt;/strong&gt; Image, as a development environment.
@@ -325,11 +325,7 @@ PHP CLI - Composer - Git - Linuxbrew - Node - Gulp - SQLite - xDebug - Envoy - D
 
 &lt;p&gt;&lt;strong&gt;Note&lt;/strong&gt;: The &lt;code&gt;workspace&lt;/code&gt; and &lt;code&gt;php-fpm&lt;/code&gt; will run automatically in most of the cases, so no need to specify them in the &lt;code&gt;up&lt;/code&gt; command. If you couldn&amp;rsquo;t find them running then you need specify them as follow: &lt;code&gt;docker-compose up -d nginx php-fpm mysql workspace&lt;/code&gt;.&lt;/p&gt;
 
-&lt;p&gt;You can select your own combination of containers form the list below:&lt;/p&gt;
-
-&lt;blockquote&gt;
-&lt;p&gt;&lt;code&gt;nginx&lt;/code&gt;, &lt;code&gt;hhvm&lt;/code&gt;, &lt;code&gt;php-fpm&lt;/code&gt;, &lt;code&gt;mysql&lt;/code&gt;, &lt;code&gt;redis&lt;/code&gt;, &lt;code&gt;postgres&lt;/code&gt;, &lt;code&gt;mariadb&lt;/code&gt;, &lt;code&gt;neo4j&lt;/code&gt;, &lt;code&gt;mongo&lt;/code&gt;, &lt;code&gt;apache2&lt;/code&gt;, &lt;code&gt;caddy&lt;/code&gt;, &lt;code&gt;memcached&lt;/code&gt;, &lt;code&gt;beanstalkd&lt;/code&gt;, &lt;code&gt;beanstalkd-console&lt;/code&gt;, &lt;code&gt;rabbitmq&lt;/code&gt;, &lt;code&gt;beanstalkd-console&lt;/code&gt;, &lt;code&gt;workspace&lt;/code&gt;, &lt;code&gt;phpmyadmin&lt;/code&gt;, &lt;code&gt;adminer&lt;/code&gt;, &lt;code&gt;aerospike&lt;/code&gt;, &lt;code&gt;pgadmin&lt;/code&gt;, &lt;code&gt;elasticsearch&lt;/code&gt;, &lt;code&gt;rethinkdb&lt;/code&gt;, &lt;code&gt;postgres-postgis&lt;/code&gt;, &lt;code&gt;certbot&lt;/code&gt;, &lt;code&gt;mailhog&lt;/code&gt;, &lt;code&gt;minio&lt;/code&gt; and more&amp;hellip;!&lt;/p&gt;
-&lt;/blockquote&gt;
+&lt;p&gt;You can select your own combination of containers form &lt;a href=&#34;http://laradock.io/introduction/#supported-software-images&#34;&gt;this list&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;&lt;em&gt;(Please note that sometimes we forget to update the docs, so check the &lt;code&gt;docker-compose.yml&lt;/code&gt; file to see an updated list of all available containers).&lt;/em&gt;&lt;/p&gt;
 

+ 3 - 3
docs/introduction/index.html

@@ -403,7 +403,7 @@ You can turn On/Off as many instances of as any container without worrying about
 
 <ul>
 <li><strong>Database Engines:</strong>
-MySQL - MariaDB - MongoDB - Neo4j - RethinkDB - PostgreSQL - Postgres Postgis.</li>
+MySQL - MariaDB - MongoDB - Neo4j - RethinkDB - MSSQL - PostgreSQL - Postgres Postgis.</li>
 <li><strong>Cache Engines:</strong>
 Redis - Memcached - Aerospike</li>
 <li><strong>PHP Servers:</strong>
@@ -411,9 +411,9 @@ NGINX - Apache2 - Caddy</li>
 <li><strong>PHP Compilers:</strong>
 PHP FPM - HHVM</li>
 <li><strong>Message Queuing:</strong>
-Beanstalkd - Beanstalkd Console - RabbitMQ - RabbitMQ Console</li>
+Beanstalkd - Beanstalkd Console - RabbitMQ - RabbitMQ Console - PHP Worker</li>
 <li><strong>Tools:</strong>
-PhpMyAdmin - Adminer - PgAdmin - ElasticSearch - Selenium - Certbot - Mailhog - Minio&hellip;</li>
+HAProxy - Jenkins - ElasticSearch - Selenium - Certbot - Mailhog - Minio - Varnish - PhpMyAdmin - Adminer - PgAdmin - MailHog&hellip;</li>
 </ul>
 
 <p>Laradock introduces the <strong>Workspace</strong> Image, as a development environment.

+ 3 - 3
docs/introduction/index.xml

@@ -84,7 +84,7 @@ You can turn On/Off as many instances of as any container without worrying about
 
 &lt;ul&gt;
 &lt;li&gt;&lt;strong&gt;Database Engines:&lt;/strong&gt;
-MySQL - MariaDB - MongoDB - Neo4j - RethinkDB - PostgreSQL - Postgres Postgis.&lt;/li&gt;
+MySQL - MariaDB - MongoDB - Neo4j - RethinkDB - MSSQL - PostgreSQL - Postgres Postgis.&lt;/li&gt;
 &lt;li&gt;&lt;strong&gt;Cache Engines:&lt;/strong&gt;
 Redis - Memcached - Aerospike&lt;/li&gt;
 &lt;li&gt;&lt;strong&gt;PHP Servers:&lt;/strong&gt;
@@ -92,9 +92,9 @@ NGINX - Apache2 - Caddy&lt;/li&gt;
 &lt;li&gt;&lt;strong&gt;PHP Compilers:&lt;/strong&gt;
 PHP FPM - HHVM&lt;/li&gt;
 &lt;li&gt;&lt;strong&gt;Message Queuing:&lt;/strong&gt;
-Beanstalkd - Beanstalkd Console - RabbitMQ - RabbitMQ Console&lt;/li&gt;
+Beanstalkd - Beanstalkd Console - RabbitMQ - RabbitMQ Console - PHP Worker&lt;/li&gt;
 &lt;li&gt;&lt;strong&gt;Tools:&lt;/strong&gt;
-PhpMyAdmin - Adminer - PgAdmin - ElasticSearch - Selenium - Certbot - Mailhog - Minio&amp;hellip;&lt;/li&gt;
+HAProxy - Jenkins - ElasticSearch - Selenium - Certbot - Mailhog - Minio - Varnish - PhpMyAdmin - Adminer - PgAdmin - MailHog&amp;hellip;&lt;/li&gt;
 &lt;/ul&gt;
 
 &lt;p&gt;Laradock introduces the &lt;strong&gt;Workspace&lt;/strong&gt; Image, as a development environment.