Commit Graph

2319 Commits

Author SHA1 Message Date
Luciano Jr
f2420ec52c Merge pull request #22 from laradock/master
Just update the fork
2017-09-22 12:13:42 +01:00
Alexander Makarov
fe254e86e3 Fixed typo in nginx [skip ci] 2017-09-22 13:10:08 +03:00
Mahmoud Zalt
53b7f75500 Merge pull request #1145 from vjekoslav/master
Fixes issue #1139, non-responding mirrors.aliyun.com. Reverses 6440ca…
2017-09-20 20:09:47 +03:00
Vjekoslav Nikolic
4150f0b140 Fixes issue #1139, non-responding mirrors.aliyun.com. Reverses 6440ca841a 2017-09-20 05:44:36 -07:00
Mahmoud Zalt
d340b6e60f Merge pull request #1140 from deleugpn/patch-1
Make it easier to solve nginx build stuck
2017-09-19 01:39:15 +03:00
Mahmoud Zalt
e7357eab83 Merge pull request #1142 from roelal/apache_socket_timeout
add APACHE_PHP_UPSTREAM_TIMEOUT
2017-09-19 01:38:28 +03:00
Roel Arents
110aa91c59 add APACHE_PHP_UPSTREAM_TIMEOUT 2017-09-18 15:24:48 +02:00
Marco Aurélio Deleu
e5aef41dd2 Make it easier to solve nginx build stuck 2017-09-18 13:07:30 +02:00
Mahmoud Zalt
ae048e6c66 Merge pull request #1137 from JoelRSimpson/patch-1
Update docker-compose.yml
2017-09-15 22:08:55 +03:00
Joel Simpson
a5f3a92eb4 Update docker-compose.yml
It looks like the 
     219: user: "1000:50" 
statement was added a while back to fix a file permissions issue, but on a completely fresh up it keeps mysql from starting, generating the following.  Removing the line allowed everything to work properly.:

mysql_1                | Initializing database
mysql_1                | mysqld: Can't create/write to file '/var/lib/mysql/is_writable' (Errcode: 13 - Permission denied)
mysql_1                | 2017-09-14T23:55:30.989254Z 0 [Note] Basedir set to /usr/
mysql_1                | 2017-09-14T23:55:30.989559Z 0 [Warning] The syntax '--symbolic-links/-s' is deprecated and will be removed in a future release
mysql_1                | 2017-09-14T23:55:30.989602Z 0 [Warning] 'NO_ZERO_DATE', 'NO_ZERO_IN_DATE' and 'ERROR_FOR_DIVISION_BY_ZERO' sql modes should be used with strict mode. They will be merged with strict mode in a future release.
mysql_1                | 2017-09-14T23:55:30.990877Z 0 [ERROR] --initialize specified but the data directory exists and is not writable. Aborting.
mysql_1                | 2017-09-14T23:55:30.990886Z 0 [ERROR] Aborting
2017-09-14 17:17:34 -07:00
Mahmoud Zalt
655b9a1526 Merge pull request #1128 from chkm8/aws-ebcli
Aws ebcli
2017-09-13 00:17:05 +03:00
Melchor O. Abcede Jr
7ac37ecd35 added aws docs 2017-09-12 04:30:53 +08:00
Melchor O. Abcede Jr
792789e479 added eb cli container 2017-09-12 04:13:44 +08:00
Mahmoud Zalt
801ccd47d2 Merge pull request #1121 from freearhey/master
Added support of ImageMagick
2017-09-06 14:59:29 +03:00
Arhey
5c5f94600a Rename laravel.pool.conf to xlaravel.pool.conf
Fix issue #1011
2017-09-06 00:22:18 +03:00
Arhey
b2e372054f Fixed php-fpm build 2017-09-05 23:36:30 +03:00
Arhey
0a23d53ee5 Move php-imagick to php-fpm and enable it 2017-09-05 21:47:47 +03:00
Arhey
f6552aca97 Added support of ImageMagick to php-fpm 2017-09-05 21:09:34 +03:00
Mahmoud Zalt
e9806d9bca Merge pull request #1120 from WanchiaTsai/add-env-path-for-node
add ENV PATH, fix the problem of docker-compose exec workspace npm(or…
2017-09-05 16:30:44 +03:00
wanchia
e56801846b add ENV PATH, fix the problem of docker-compose exec workspace npm(or other node-related script). 2017-09-05 11:06:53 +08:00
Arhey
f9e6acd4e1 Fix syntax error 2017-09-05 03:15:24 +03:00
Arhey
b61ff4f484 Added support of ImageMagick 2017-09-05 02:36:24 +03:00
Mahmoud Zalt
8485add87a Merge pull request #1117 from masterjus/fix-php_redis-installation
Fix Php Redis extension installation
2017-09-04 22:40:21 +03:00
Luciano Jr
d3fb967f0f Merge pull request #21 from laradock/master
Up-to-date
2017-09-04 10:49:41 +01:00
Eugene Kirdzei
a36620c3bd Restart build 2017-09-04 12:05:34 +03:00
Eugene Kirdzei
cddc934e1e Fix phpreddis installation for all versions of php 2017-09-04 11:33:14 +03:00
Eugene Kirdzei
53b3ad0f7e Fix Php Redis extension installation 2017-08-31 19:29:19 +03:00
Mahmoud Zalt
fdcf9117ac Merge pull request #1115 from joaorobertopb/patch-1
Changes to correct version of dockerfile
2017-08-30 01:07:37 +03:00
João Roberto P. Borges
f800a3221a Changes to correct version of dockerfile
- Removes extra spaces
2017-08-29 12:54:01 -03:00
Mahmoud Zalt
a1d3eeb7e6 Merge pull request #1107 from oaattia/master
Can't create/write to file '/var/lib/mysql/is_writable'
2017-08-23 21:14:29 +03:00
Mahmoud Zalt
b2f7348552 Merge pull request #1101 from terryzwt/drpual-console
add drupal console to workspace
2017-08-23 21:14:13 +03:00
Mahmoud Zalt
ebeddcba23 Merge pull request #1097 from macghriogair/master
[php-worker] dedicated dockerfile for php 7.0/7.1
2017-08-23 21:11:45 +03:00
Mahmoud Zalt
dba37307b5 Merge pull request #1093 from zuohuadong/patch-7
fix to backup and fix max client
2017-08-23 21:11:02 +03:00
Osama
2af5b2ff49 fix mysql can't write to file 2017-08-22 12:12:56 +03:00
terry
93d5b318fe add drupal console to workspace 2017-08-19 22:58:40 +08:00
Patrick Mac Gregor
9ce470e14e [php-worker] dedicated dockerfile for php 7.0/7.1
fixes #927: PHP-Worker container uses PHP-CLI 7.0.9 despite workspace using 7.1.4
2017-08-17 09:39:37 +02:00
Mahmoud Zalt
38fb49bccc Merge pull request #1095 from exfriend/patch-2
Fix supervisord.conf file path
2017-08-17 04:37:18 +03:00
Vladislav Otchenashev
08896f9fb6 Fix supervisord.conf file path
otherwise image ignores the supplied supervisord.conf
2017-08-16 00:33:51 +03:00
Mahmoud Zalt
dcab211b07 Merge pull request #1094 from zuohuadong/patch-8
add pgadmin backup volumes
2017-08-14 23:53:31 +03:00
zuohuadong
76001daf71 add pgadmin backup volumes
you can use backup files  in ${DATA_SAVE_PATH}/pgadmin-backup
2017-08-14 10:09:17 +08:00
zuohuadong
30b626d43e fix to backup and fix max client
in  this version, you can backup postgresql
2017-08-14 10:04:11 +08:00
Mahmoud Zalt
586a225c11 Merge pull request #1089 from ELD/add-dusk-support-and-docs
add docs on running Laravel Dusk tests
2017-08-11 10:26:31 +03:00
Eric Dattore
c099a51d52 add docs on running Laravel Dusk tests 2017-08-10 21:08:09 -06:00
Mahmoud Zalt
245ddf3441 update documentation link in the readme 2017-08-09 16:18:29 +03:00
Mahmoud Zalt
0192346cf2 Merge pull request #1082 from arywidiantara/master
[UPDATE] change config redis from docker compose to env
2017-08-09 11:28:06 +03:00
Ary Widiantara
e4f4de47e7 [UPDATE] change config redis from docker compose to env 2017-08-09 10:17:53 +07:00
Mahmoud Zalt
69ccd74d2e Update Improve MAC speed docs 2017-08-08 15:01:41 +03:00
Mahmoud Zalt
a3c66fdecf Merge pull request #1080 from zuohuadong/patch-6
use openssh-client not  openssh*
2017-08-08 09:03:55 +03:00
Mahmoud Zalt
9b8eee6a98 Merge pull request #1079 from zuohuadong/patch-5
add demo and  use  caddy example for laravel
2017-08-08 09:03:18 +03:00
zuohuadong
668acd66c1 use openssh-client not openssh*
https://hub.docker.com/r/abiosoft/caddy/~/dockerfile/
2017-08-08 11:36:16 +08:00