Commit Graph

265 Commits

Author SHA1 Message Date
Mahmoud Zalt 5c0b8316b1 make the PHP_UPSTREAM config for NGINX and Apache identical 2017-08-04 00:50:20 +03:00
Mahmoud Zalt 63816ab7d6 Merge branch 'change-mysql-version' of https://github.com/hackel/laradock into hackel-change-mysql-version
* 'change-mysql-version' of https://github.com/hackel/laradock:
  Add documentation on the MYSQL_VERSION variable.
  Allow specifying the version of MySQL to install in .env file.
2017-07-25 23:30:46 +03:00
Ujjwal Ojha 9dda2f6b9f image optimizers libraries 2017-07-10 18:49:39 +05:45
Ryan Hayle 7ec8b8846e Allow specifying the version of MySQL to install in .env file. 2017-07-07 16:43:06 -05:00
Vincent Chu 02e2454c79 add docker-entrypoint-initdb.d variables for MySQL + MariaDB + Percona 2017-07-06 00:39:16 -04:00
Mahmoud Zalt bf60f7520b Merge pull request #1038 from vwchu/master
add APACHE_SITES_PATH variable
2017-07-04 07:25:40 +03:00
Mahmoud Zalt 916e9f38f3 Merge pull request #1022 from ItaloBC/patch-3
ElasticSearch instance fails at loading (missing parameters)
2017-07-04 07:25:20 +03:00
Vincent Chu bc1c957f47 add APACHE_SITES_PATH variable 2017-06-30 06:22:55 -04:00
Patrick Mac Gregor 1951834150 [Fix] Mailhog should be exposed to backend
- fixes failing connection to host "mailhog" when sending mail via smtp
- mailhog needs to be available for the backend at Port 1025
- i.e. in a Laravel app .env should contain "MAIL_HOST=mailhog
2017-06-28 11:28:04 +02:00
ItaloBC bbbd247653 ElasticSearch instance fails at loading (wrong)
ElasticSearch (ES from now onwards) will fail to initialize since the parameters for its environment are not correct or absent. These are:

* `cluster.name`: Name of the cluster itself
* `bootstrap.memory_lock`: Needed for ES to [lock the JVM into swap instead of memory](https://www.elastic.co/guide/en/elasticsearch/reference/master/_memory_lock_check.html).
* `"ES_JAVA_OPTS=-Xms256m -Xmx256m"`: [Initial and maximum HEAP size for JVM](https://www.elastic.co/guide/en/elasticsearch/reference/current/_heap_size_check.html). Since it's locked to disk, should be the same. Half the defaults (512m) for development.
* `ulimits: memlock: soft (-1), hard (-1)`: [ES needs to have unlimited access to memory](https://www.elastic.co/guide/en/elasticsearch/reference/current/max-size-virtual-memory-check.html), otherwise it will feel sluggish.  
* `mem_limit: 512m`: Hard limit the memory available for the container.

This can, and should, be changed using `.env` file variables, but it seems that this should suffice for basic ES development.
2017-06-14 14:19:47 -04:00
Michal Ardziejewski e56587ec47 Added TZ environment for MySQL Container 2017-06-13 01:03:42 +02:00
Mark Davidson 0561199914 Add Kibana Container (#993)
* Add Kibana Container

* Add Kibana Port to env-example
2017-06-02 23:54:37 -05:00
Mahmoud Zalt 4a663649c0 Merge pull request #983 from cre8/master
Add laravel echo server
2017-05-30 17:50:08 +03:00
Lawrence Eldridge d0c0a8895e add global instance of larval installer for fresh projects. (#988) 2017-05-30 09:05:30 -05:00
Mirko da60b32a04 add laravel echo server 2017-05-27 15:24:50 +02:00
Shao Yu Lung f3a016aa79 adminer support mssql 2017-05-25 16:44:51 +08:00
wxb 01f6d8f038 edit docker-compose.yml, add swoole config 2017-05-15 02:07:45 +08:00
Shao Yu Lung 6ff7f4a402 percona service use DATA_SAVE_PATH env var, same way mysql, mariadb. 2017-05-13 22:04:35 +08:00
Shao Yu Lung 20fddc6de7 fix percona service create multiple db solution user can’t see other db problem. 2017-05-13 21:37:25 +08:00
Winfried 1eaac78fdd Merge pull request #936 from bestlong/fix-mariadb-create-multiple-db-user-cant-see
Fixing MariaDB service create multiple db solution
2017-05-13 13:45:40 +02:00
Shao Yu Lung 855241d966 fix mariadb service create multiple db solution user can’t see other db problem. 2017-05-13 11:00:36 +08:00
Mahmoud Zalt be9f7f8346 Merge pull request #935 from xpert13/patch-1
Fix #934. Add extra_hosts to php-worker container
2017-05-13 05:48:25 +03:00
Alex 41574fe026 Fix #934. Add extra_hosts to php-worker container 2017-05-12 17:17:38 +03:00
Shao Yu Lung 848398d443 php-fpm service LDAP support 2017-05-12 19:23:03 +08:00
Sascha Brendel a2058ca6f6 Merge branch 'master' into adding-env-aerospike-rethinkdb-mongodb 2017-05-09 14:07:15 +02:00
Sascha Brendel 546ef0ade6
Added ENV support for aerospike, rethinkdb and mongodb. Part of #763. 2017-05-09 01:31:00 +02:00
Sascha Brendel 4661f1ab0e
Improved caddy support to latest ENV-config. 2017-05-09 00:55:15 +02:00
Shao Yu Lung 533c8fc7f7 mysql create multiple database. 2017-05-08 22:26:10 +08:00
Winfried 07651842b6 Merge pull request #912 from zeroc0d3/master
Add network setup in Jenkins container
2017-05-08 02:36:07 +02:00
ZeroC0D3 Team 3796f9f70a Add network setup in Jenkins container 2017-05-08 06:20:43 +07:00
Winfried 4cf5f3eabf Removing suffix for Aerospike and V8JS 2017-05-07 16:54:55 +02:00
Mark Hilton e0d5fb03ed Added support for MS SQL server driver for PHP 7.0 - requested changes:
- removed cd / && \
- added INSTALL_MSSQL to docker-compose.yml and env-example
2017-05-03 13:01:03 -04:00
Winfried ef6071bff0 Fixing typo in the workspace V8 args 2017-04-23 21:16:58 +02:00
Shao Yu Lung d0effd9468 Fixing Unable to connect to postgresql server 2017-04-21 10:13:53 +12:00
Diego Antunes 5aab3add44 Added blackfire.io 2017-04-21 10:02:54 +12:00
Yu-Lung Shao (Allen) c67fa5b258 Fixing could not resolve host: elasticsearch (#823) 2017-04-18 12:23:44 +08:00
Diego Antunes a91bd19739 Merge branch 'master' of https://github.com/laradock/laradock 2017-04-18 10:27:37 +12:00
Diego Antunes ba32dedbef Added Percona container as an alternative to mysql mariadb 2017-04-18 10:19:09 +12:00
Shao Yu Lung 5f3e0a9109 Fixing Adminer can’t login 2017-04-17 13:40:30 +08:00
wxb f14b3b32cf add php.ini file 2017-04-16 19:33:27 +08:00
wxb 3a8bd8a015 add data save path(mysql/redis/memcached..) 2017-04-16 19:08:03 +08:00
Mahmoud Zalt efc23a693d add missing workspace tools to the docs 2017-04-14 21:02:04 -04:00
Mahmoud Zalt c78eb5228a Merge pull request #803 from activeobjects/master
Added support for jenkins official container
2017-04-13 11:48:57 -04:00
Steve Walker 81053c0868 Added support for jenkins official container 2017-04-12 15:54:42 +00:00
Winfried f91def64d7 Fixing whitespaces and tailing spaces 2017-04-11 21:22:57 +02:00
Mahmoud Zalt ddabb4620e Merge pull request #784 from winfried-van-loon/645-php-fpm-ghostscript
Fixing ghostscript env option
2017-04-11 13:24:29 -04:00
Mahmoud Zalt b86211d2d8 Merge pull request #781 from winfried-van-loon/764-780-php-fpm-mysql
Merging removed MySQL ext into MySQLi setting
2017-04-11 13:23:45 -04:00
Winfried ef38dd1532 Fixing ghostscript env option 2017-04-11 16:45:20 +02:00
Winfried 80a60d58cf Merging removed MySQL ext into MySQLi setting 2017-04-11 13:22:07 +02:00
Yu-Lung Shao (Allen) 15cac480fe Fixing can't login to PHPMyAdmin
fix #754, login to PHPMyAdmin get "#2005 - Unknown MySQL server host 'mysql' (-2)" error.
2017-04-10 09:50:53 +08:00