Commit Graph

2210 Commits

Author SHA1 Message Date
Yew JS
48a53f1d24 Update Dockerfile-70
install libJPEG and enabled in GD
2016-07-13 14:12:32 +08:00
Jack Fletcher
11cdfd440b Updated README
References #135
2016-07-12 17:52:06 +01:00
Jack Fletcher
14cbe9f935 Moved volume container definitions
I've placed the `application` and `data` directories into a `volumes`
subdirectory. The top level `data` directory is now used for storing the
data used by the database (and other, if any) containers. The `data`
directory has also been added to the `.gitignore` file to prevent
accidental pushing of user data.
2016-07-12 17:11:57 +01:00
Jack Fletcher
42d63236f1 Changed the data container volume mappings
All of the database data volume mapping have been changed from the host's
`/var/lib` directory to locally alongside the laradock installation. This
should hopefully prevent issues where data disappears after containers are
restarted or data on the host machine is overwritten by accident (scary!)

Additionally this should make data easier to backup between installations
- especially on Windows where `/var` does not exist and is created
  transparently by Docker Machine/Windows beta.

This change will most likely cause data to disappear from existing
installations, however it may reappear if moved to it's new home.

References #137, #138
2016-07-12 16:39:08 +01:00
Jack Fletcher
d01d087431 Added more detail to the README 2016-07-12 16:38:20 +01:00
Jack Fletcher
11c65c4a00 Fix variable not set warning
Added an untracked `.env` file to the root directory to prevent the
`WARNING: The INSTALL_PRESTISSIMO variable is not set` message from being
displayed when `docker-compose` is run.

Added section in README for optional features.
2016-07-12 16:27:55 +01:00
Mahmoud Zalt
1b9630e8a1 Merge pull request #132 from Niksac/fix-readme
Update README.md
2016-07-07 21:39:26 +03:00
Niksac
3a714339da Update README.md 2016-07-07 15:29:00 +02:00
Mahmoud Zalt
65078505c1 Merge pull request #123 from appleboy/patch-6
Added support upload file size setting.
2016-06-28 16:06:29 +03:00
Bo-Yi Wu
e0b4734dab Added support upload file size setting.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-28 17:18:37 +08:00
Mahmoud Zalt
243392444f Merge pull request #122 from LaraDock/Hotfix/mongo
Hotfix/mongo
2016-06-27 14:00:09 +03:00
Mahmoud Zalt
72a8fc049d Merge branch 'zhikiri-hotfix/mongo-support'
* zhikiri-hotfix/mongo-support:
  Fix conflict merging zhikiri-hotfix/mongo-support
2016-06-27 13:59:24 +03:00
Mahmoud Zalt
de6db93da8 Fix conflict merging zhikiri-hotfix/mongo-support 2016-06-27 13:58:48 +03:00
Mahmoud Zalt
1af9dc5ac2 Merge pull request #121 from zhikiri/feature/mcrypt-extension
Added supporting of the mcrypt extenstion
2016-06-27 13:45:37 +03:00
zhikiri
62878e7c49 Added supporting of the mcrypt extenstion 2016-06-27 11:30:25 +03:00
Mahmoud Zalt
3cd1f070e1 Merge pull request #118 from appleboy/patch-5
remove duplicate white spaces
2016-06-25 20:38:54 +03:00
Bo-Yi Wu
fb5ea7f42c remove duplicate white spaces
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-25 19:40:36 +08:00
Mahmoud Zalt
aa8be6f95b list the contributors names in the readme
@benmag @mattythebatty @AminMkh @appleboy
2016-06-25 07:36:03 +03:00
Mahmoud Zalt
aa0a726945 change enter container commands in the doc
`docker-compose run …` to `docker exec -it …`
2016-06-25 07:33:30 +03:00
Luciano Jr
5ebb061b70 Merge pull request #3 from LaraDock/master
Merge
2016-06-24 15:19:12 +01:00
Mahmoud Zalt
e5e04e4e18 update the readme: exec command to run 2016-06-23 08:58:43 +03:00
Mahmoud Zalt
44d8720400 Merge pull request #115 from appleboy/patch-2
Change command about enter workspace container.
2016-06-23 08:52:37 +03:00
Mahmoud Zalt
f0200626ba Merge pull request #114 from Kauhat/master
Added support to conditionally install Prestissimo
2016-06-23 08:36:48 +03:00
Bo-Yi Wu
69406db3e0 Change command about enter workspace container. 2016-06-23 13:16:52 +08:00
Jack Fletcher
bcb749151a Added support to conditionally install Prestissimo 2016-06-22 21:47:06 +01:00
Mahmoud Zalt
ca413edff4 Merge pull request #112 from appleboy/patch-2
Fixed Change wrong project name.
2016-06-22 17:21:05 +03:00
Bo-Yi Wu
f6d1d6f617 Fixed Change wrong project name. 2016-06-22 22:20:24 +08:00
Mahmoud Zalt
117382a050 Merge branch 'pr/111'
(fix conflict)
* pr/111:
  add Node Version Manager (nvm)
2016-06-22 17:18:23 +03:00
Mahmoud Zalt
2e930df2a7 Merge pull request #109 from appleboy/composer
Load xdebug Zend extension with phpunit command.
2016-06-22 16:57:08 +03:00
Bo-Yi Wu
4922c5fafd add Node Version Manager (nvm)
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-22 09:33:17 +08:00
Bo-Yi Wu
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
Mahmoud Zalt
8d216f83d5 Merge pull request #101 from appleboy/gd
Support gd extension.
2016-06-16 17:47:04 +03:00
Bo-Yi Wu
05c5fcf216 Support gd extension.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-16 14:57:27 +08:00
Mahmoud Zalt
fccee522c6 update the readme 2016-06-11 20:49:04 +03:00
Mahmoud Zalt
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
Mahmoud Zalt
685c34d12d add Mongo Support to the Readme 2016-06-11 17:10:18 +03:00
Mahmoud Zalt
ceba1af3ae Merge pull request #94 from AminMkh/AminMkh-mongodb-extension
added php-mongodb extension
2016-06-11 15:47:16 +03:00
Amin Mkh
c4100b5052 added php-mongodb extension 2016-06-11 14:38:26 +03:00
Mahmoud Zalt
1148a3d051 Merge pull request #91 from LaraDock/xdebug
Xdebug
2016-06-03 15:06:57 +03:00
Mahmoud Zalt
bec1a32550 format the laravel.ini file 2016-06-03 15:01:56 +03:00
Mahmoud Zalt
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
Mahmoud Zalt
4f9cdb02c6 link global gulp to be used locally 2016-06-03 14:16:46 +03:00
Bo-Yi Wu
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
Bo-Yi Wu
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
Mahmoud Zalt
eda286ded2 Merge pull request #87 from LaraDock/appleboy-patch-1
Appleboy patch 1 (fixing volumes mounting)
2016-06-03 01:52:24 +03:00
Mahmoud Zalt
a8b4b61e28 update the volumes mounting of the DB containers 2016-06-03 01:50:11 +03:00
Mahmoud Zalt
124a3553e6 simple reformatting 2016-06-01 14:45:27 +03:00
Mahmoud Zalt
3ff4aaca79 set the original volume path 2016-06-01 14:44:40 +03:00
Mahmoud Zalt
4c06a03ead get mongo volum from the data container 2016-06-01 14:44:10 +03:00
Mahmoud Zalt
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