Commit Graph

1849 Commits

Author SHA1 Message Date
Bo-Yi Wu
f9fe45cb75 Merge pull request #551 from mylxsw/master
bugfix for phpredis configuration
2017-01-13 15:18:18 +08:00
管宜尧
a8120a1c46 bugfix for phpredis configuration
bugfix for phpredis configuration
2017-01-13 15:06:35 +08:00
Philippe Trépanier
6c55f47fd4 Added instructions on how to fix time lag, this fixes #372, #462 (#547) 2017-01-12 19:26:29 -05:00
g0ld3lux
f1cd4bb0e2 added phpredis in dockerfile70 (#546) 2017-01-12 19:06:08 -05:00
Bo-Yi Wu
53146df5d6 Merge pull request #544 from gfd6th/master
Fix bug on mariadb
2017-01-12 18:55:35 +08:00
hexu
14f6dffe99 Fix bug on mariadb
Bug on Docker for Mac when we change the database from mysql to mariadb.

Maybe It is not a perfect fix. This fix will not share the same mysql volume, means we could not change database directly. We have to import the database to both database. But it will fix the Bug . Wish for better solution
2017-01-12 18:47:11 +08:00
TJ
721e04370f Updated Crontab for Workspace (#538)
- Crontab now gets added to `/etc/cron.d`
- Base crontab now runs as the `laradock` user

This update resolves #459.
2017-01-10 16:34:55 -05:00
Luciano Jr
bd87a26db1 Merge pull request #16 from laradock/master
Just update the fork
2017-01-09 17:46:36 +00:00
Edmund Luong
b569765f82 Add .env file for converting Windows paths to resolve issues with Docker Compose in Docker Toolbox (#531) 2017-01-07 11:35:59 -05:00
Bo-Yi Wu
1c9596dd80 Merge pull request #523 from yaoshanliang/patch-1
Update README-zh.md
2017-01-03 09:43:25 +08:00
Mahmoud Zalt
c59dea3745 add beanstalkd section and update the readme.md 2017-01-02 20:41:00 -05:00
iat
460b24f7ee Update README-zh.md 2017-01-03 09:27:45 +08:00
Edmund Luong
2fc3919598 Added service container for Selenium standalone with Chrome (#519)
* Added service container for Selenium standalone with Chrome
2017-01-01 10:22:01 -05:00
Luciano Jr
c0283da6ee Merge pull request #15 from laradock/master
Just update the fork to keep sync
2016-12-30 11:34:19 +00:00
Bo-Yi Wu
978dd425b9 Merge pull request #515 from cosmospham/master
fix syntax in xdebugPhpFpm
2016-12-27 14:36:01 +08:00
Cosmos Pham
1b8726458f fix syntax in xdebugPhpFpm 2016-12-27 13:32:59 +07:00
Bo-Yi Wu
3557f508d0 Merge pull request #513 from cristiancmello/add-rethinkdb
Add rethinkdb
2016-12-26 22:44:21 +08:00
Cristian Mello
1ce802f2cc Update docker-compose.yml 2016-12-26 12:38:50 -02:00
Cristian Mello
f0eda43906 Update README.md 2016-12-26 02:12:11 -02:00
Cristian Mello
343a950adc add rethink-db container 2016-12-26 01:59:58 -02:00
Bo-Yi Wu
0218ef6b9f remove tabs. 2016-12-26 10:30:14 +08:00
Cristian Mello
33e8e91e49 Add Laravel Envoy (#510)
Add laravel envoy
2016-12-25 12:38:25 -05:00
Bo-Yi Wu
e78b3ff799 Merge pull request #507 from WDZThorn/patch-1
Update Dockerfile
2016-12-24 07:00:02 -06:00
per3evere
13bdfa119d Update Dockerfile
Replace tab with 4 spaces.
2016-12-23 13:35:45 +08:00
Philippe Trépanier
0eea7a639a Merge pull request #506 from Jono20201/patch/artisan-alias
Add `art` alias for `php artisan` - like homestead
2016-12-22 16:14:57 -05:00
Jonathan Martin
f2db21f339 Add art alias for php artisan -- like homestead 2016-12-22 15:28:23 +00:00
Mahmoud Zalt
b10108a9b5 disable installing the bcmath by default
disable installing the PHP bcmath extension by default on the php-fpm container
2016-12-21 14:20:40 -05:00
Mahmoud Zalt
dd3e88fba9 Merge pull request #502 from laradock/support-bcmath-php-ext
Support bcmath php extension on php-fpm and workspace (base image 1.3)
2016-12-21 14:10:14 -05:00
Mahmoud Zalt
860af556e2 Support bcmath php extention on php-fpm and workspace (base image 1.3)
Probably closes #453
2016-12-21 14:01:51 -05:00
Bo-Yi Wu
586a21086f Merge pull request #501 from whoan/patch-1
Typo
2016-12-21 23:30:02 +08:00
Juan Eugenio Abadie
d76f9e7722 Typo
elasticsearch-pkugins ->  elasticsearch-plugins
2016-12-21 10:16:32 -03:00
Bo-Yi Wu
79ce978527 Merge pull request #500 from shukebeta/master
fix a important document typo
2016-12-21 09:20:20 +08:00
shukebeta
944639b248 fix a important typo
docker-compose build php => docker-compose build php-fpm
2016-12-21 08:09:41 +08:00
Philippe Trépanier
2728a99986 Merge pull request #496 from cosmospham/master
Fix PHP 5.6 Dockerfile syntax error
2016-12-20 02:29:59 -05:00
Cosmos Pham
5bb515751a Fix PHP 5.6 Dockerfile syntax error
Syntax error: ";" unexpected
2016-12-20 13:20:53 +07:00
Philippe Trépanier
ea148943ed Merge pull request #495 from philtrep/related-projects
Added related projects to docs
2016-12-19 10:57:25 -05:00
philtrep
97f882e4c7 Added related projects to docs 2016-12-19 10:55:44 -05:00
Bo-Yi Wu
e9d3a838f1 Merge pull request #491 from laradock/bug
fix #490 duplication of key "volumes"
2016-12-16 17:23:01 +08:00
Bo-Yi Wu
380eef5fd9 fix #490 duplication of key "volumes"
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-12-16 17:21:45 +08:00
Bo-Yi Wu
047e7f7cc3 Merge pull request #489 from laradock/yarn
Support specific version of yarn.
2016-12-16 10:58:38 +08:00
Bo-Yi Wu
b8142222e5 Support specific version of yarn.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-12-16 09:36:08 +08:00
Philippe Trépanier
b62d9bcb60 Merge pull request #488 from abtrumpet/add-soap
Added SOAP option to php-fpm install.
2016-12-15 17:59:40 -05:00
Austin Benesh
da6b950623 Added SOAP option to php-fpm install. 2016-12-15 12:13:27 -07:00
Philippe Trépanier
9d60dad222 Merge pull request #486 from dlnsk/mysql_strict_fix
Fix mysql strict NO_ZERO_DATE
2016-12-15 10:14:22 -05:00
Dmitry Pupinin
6ffa36f188 Fix mysql strict NO_ZERO_DATE 2016-12-15 21:51:22 +07:00
Vladimir Kireyko
aabe504c24 Add dokerfile with php 7.1 2016-12-15 15:13:00 +02:00
Vladimir Kireyko
b401c517b2 Add dockerfile with php-fpm 7.1 2016-12-15 15:05:48 +02:00
Philippe Trépanier
f82d3b30b4 Merge pull request #483 from edmundluong/master
Add option to install Google V8 Javascript Engine PHP extension
2016-12-13 20:22:20 -05:00
Edmund Luong
8bacb129c6 Add option to install Google V8 Javascript Engine PHP extension 2016-12-13 20:00:48 -05:00
Philippe Trépanier
99fb1b4169 Merge pull request #474 from AliveCorpse/master
Fix load of mongodb library
2016-12-12 13:37:13 -05:00