de6db93da8
Fix conflict merging zhikiri-hotfix/mongo-support
2016-06-27 13:58:48 +03:00
1af9dc5ac2
Merge pull request #121 from zhikiri/feature/mcrypt-extension
...
Added supporting of the mcrypt extenstion
2016-06-27 13:45:37 +03:00
62878e7c49
Added supporting of the mcrypt extenstion
2016-06-27 11:30:25 +03:00
3cd1f070e1
Merge pull request #118 from appleboy/patch-5
...
remove duplicate white spaces
2016-06-25 20:38:54 +03:00
fb5ea7f42c
remove duplicate white spaces
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-25 19:40:36 +08:00
aa8be6f95b
list the contributors names in the readme
...
@benmag @mattythebatty @AminMkh @appleboy
2016-06-25 07:36:03 +03:00
aa0a726945
change enter container commands in the doc
...
`docker-compose run …` to `docker exec -it …`
2016-06-25 07:33:30 +03:00
5ebb061b70
Merge pull request #3 from LaraDock/master
...
Merge
2016-06-24 15:19:12 +01:00
e5e04e4e18
update the readme: exec command to run
2016-06-23 08:58:43 +03:00
44d8720400
Merge pull request #115 from appleboy/patch-2
...
Change command about enter workspace container.
2016-06-23 08:52:37 +03:00
f0200626ba
Merge pull request #114 from Kauhat/master
...
Added support to conditionally install Prestissimo
2016-06-23 08:36:48 +03:00
69406db3e0
Change command about enter workspace container.
2016-06-23 13:16:52 +08:00
bcb749151a
Added support to conditionally install Prestissimo
2016-06-22 21:47:06 +01:00
ca413edff4
Merge pull request #112 from appleboy/patch-2
...
Fixed Change wrong project name.
2016-06-22 17:21:05 +03:00
f6d1d6f617
Fixed Change wrong project name.
2016-06-22 22:20:24 +08:00
117382a050
Merge branch 'pr/111'
...
(fix conflict)
* pr/111:
add Node Version Manager (nvm)
2016-06-22 17:18:23 +03:00
2e930df2a7
Merge pull request #109 from appleboy/composer
...
Load xdebug Zend extension with phpunit command.
2016-06-22 16:57:08 +03:00
4922c5fafd
add Node Version Manager (nvm)
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-22 09:33:17 +08:00
198c38f6cd
Load xdebug Zend extension with phpunit command.
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-21 14:03:39 +08:00
8d216f83d5
Merge pull request #101 from appleboy/gd
...
Support gd extension.
2016-06-16 17:47:04 +03:00
05c5fcf216
Support gd extension.
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-16 14:57:27 +08:00
fccee522c6
update the readme
2016-06-11 20:49:04 +03:00
f3eb6a5fc4
Merge branch 'support-mongo'
...
* support-mongo:
add Mongo Support to the Readme
added php-mongodb extension
simple reformatting
set the original volume path
get mongo volum from the data container
added mongodb driver for php5.5 5.6
added mongodb image + PHP7 driver
Fix Conflicts in:
docker-compose.yml
php-fpm/Dockerfile-55
php-fpm/Dockerfile-56
php-fpm/Dockerfile-70
php-fpm/laravel.ini
2016-06-11 17:29:27 +03:00
685c34d12d
add Mongo Support to the Readme
2016-06-11 17:10:18 +03:00
ceba1af3ae
Merge pull request #94 from AminMkh/AminMkh-mongodb-extension
...
added php-mongodb extension
2016-06-11 15:47:16 +03:00
c4100b5052
added php-mongodb extension
2016-06-11 14:38:26 +03:00
1148a3d051
Merge pull request #91 from LaraDock/xdebug
...
Xdebug
2016-06-03 15:06:57 +03:00
bec1a32550
format the laravel.ini file
2016-06-03 15:01:56 +03:00
72cde8a8ea
Merge branch 'patch-3' of https://github.com/appleboy/laradock into appleboy-patch-3
...
* 'patch-3' of https://github.com/appleboy/laradock :
clean apt source file after install.
install xdebug to generate coverage report for unit testing.
2016-06-03 14:39:53 +03:00
4f9cdb02c6
link global gulp to be used locally
2016-06-03 14:16:46 +03:00
1673a80daf
clean apt source file after install.
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-03 14:21:52 +08:00
f130381cfe
install xdebug to generate coverage report for unit testing.
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-03 14:04:33 +08:00
eda286ded2
Merge pull request #87 from LaraDock/appleboy-patch-1
...
Appleboy patch 1 (fixing volumes mounting)
2016-06-03 01:52:24 +03:00
a8b4b61e28
update the volumes mounting of the DB containers
2016-06-03 01:50:11 +03:00
124a3553e6
simple reformatting
2016-06-01 14:45:27 +03:00
3ff4aaca79
set the original volume path
2016-06-01 14:44:40 +03:00
4c06a03ead
get mongo volum from the data container
2016-06-01 14:44:10 +03:00
1cb131ba36
Merge branch 'master' of https://github.com/AminMkh/laradock into AminMkh-master
...
* 'master' of https://github.com/AminMkh/laradock :
added mongodb driver for php5.5 5.6
added mongodb image + PHP7 driver
2016-06-01 12:59:17 +03:00
99b54c5f7d
remove unnecessary data volume of redis.
...
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-01 13:44:41 +08:00
8993cccc2c
basic updates to the reamdme
2016-05-31 19:15:29 +03:00
1090bb4db6
added mongodb driver for php5.5 5.6
2016-05-30 23:26:40 +03:00
9c7054abe2
added mongodb image + PHP7 driver
2016-05-29 14:19:43 +03:00
e7decdaaf7
add debugging section to the readme
2016-05-28 11:04:05 +03:00
18bf12bfde
Merge pull request #74 from abyshakes/master
...
Issue #73 unable to install workspace container
2016-05-26 21:17:51 +03:00
ad49981dd6
Merge pull request #2 from LaraDock/master
...
Just update fork
2016-05-25 23:11:49 +01:00
d829482a06
Issue #73 unable to install workspace container
2016-05-25 22:33:29 +05:30
86c6389650
Merge pull request #70 from Gummibeer/patch-2
...
Issue #69
2016-05-24 19:49:35 +03:00
991e28046d
Issue #69
...
add memcached to php-cli
2016-05-24 16:44:52 +02:00
ccbc73c6bc
update the readme file
2016-05-24 14:01:07 +03:00
246c7366ba
Merge pull request #68 from Gummibeer/patch-1
...
Issue #67
2016-05-24 13:23:13 +03:00
Mahmoud Zalt