Skip to content

Commit 3eb8fce

Browse files
authored
Merge pull request laradock#2 from laradock/master
Merge master
2 parents 392960d + 05f8166 commit 3eb8fce

2 files changed

Lines changed: 17 additions & 6 deletions

File tree

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
### Thank you for contributing to Laradock.
2+
3+
##### Make sure you completed the basic 3 steps below:
4+
5+
- [] I've read the simple [Contribution Guide](http://laradock.io/contributing).
6+
- [] I've updated the **documentation**. (refer to [this](http://laradock.io/contributing/#update-the-documentation-site) for how to do so).
7+
- [] I enjoyed my time contributing and making developer's life easier :)

DOCUMENTATION/content/introduction/index.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,21 @@ In adhering to the separation of concerns principle as promoted by Docker, Larad
8383
You can turn On/Off as many instances of as any container without worrying about the configurations, everything works like a charm.
8484

8585
- **Database Engines:**
86-
MySQL - MariaDB - Percona - MongoDB - Neo4j - RethinkDB - MSSQL - PostgreSQL - Postgres Postgis.
86+
MySQL - MariaDB - Percona - MongoDB - Neo4j - RethinkDB - MSSQL - PostgreSQL - Postgres-PostGIS.
87+
- **Database Management:**
88+
PhpMyAdmin - Adminer - PgAdmin
8789
- **Cache Engines:**
8890
Redis - Memcached - Aerospike
8991
- **PHP Servers:**
9092
NGINX - Apache2 - Caddy
9193
- **PHP Compilers:**
9294
PHP FPM - HHVM
93-
- **Message Queuing:**
94-
Beanstalkd - Beanstalkd Console - RabbitMQ - RabbitMQ Console - PHP Worker
95-
- **Tools:**
96-
HAProxy - Jenkins - ElasticSearch - Selenium - Certbot - Mailhog - Minio - Varnish - PhpMyAdmin - Adminer - PgAdmin - MailHog - [Blackfire](https://blackfire.io)...
95+
- **Message Queueing:**
96+
Beanstalkd - RabbitMQ - PHP Worker
97+
- **Queueing Management:**
98+
Beanstalkd Console - RabbitMQ Console
99+
- **Random Tools:**
100+
HAProxy - Certbot - Blackfire - Selenium - Jenkins - ElasticSearch - Kibana - Mailhog - Minio - Varnish - Swoole - Laravel Echo...
97101

98102
Laradock introduces the **Workspace** Image, as a development environment.
99103
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.
@@ -148,7 +152,7 @@ Most importantly Docker can run on Development and on Production (same environme
148152
149153
What's better than a **Demo Video**:
150154

151-
- Laradock v5.* (soon or never)
155+
- Laradock v5.* (should be next!)
152156
- Laradock [v4.*](https://www.youtube.com/watch?v=TQii1jDa96Y)
153157
- Laradock [v2.*](https://www.youtube.com/watch?v=-DamFMczwDA)
154158
- Laradock [v0.3](https://www.youtube.com/watch?v=jGkyO6Is_aI)

0 commit comments

Comments
 (0)