Mahmoud Zalt
2df00ecdad
remove installing Prestissimo by default, to prevent the warning
2016-07-13 16:00:47 +03:00
Mahmoud Zalt
aeb5a6bb63
Merge pull request #140 from yewjs/patch-1
...
Update Dockerfile-70
2016-07-13 15:50:31 +03:00
Mahmoud Zalt
2bbf59ddda
Merge pull request #139 from Kauhat/master
...
Database volume mapping changes & documentation
2016-07-13 15:47:17 +03:00
Jack Fletcher
dca0545293
Fixed incorrect php-fpm container mapping
2016-07-13 10:44:17 +01:00
Jack Fletcher
5f99478c76
Fixed workspace container mapping volumes to wrong container
2016-07-13 10:08:13 +01:00
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
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
Bo-Yi Wu
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
Mahmoud Zalt
8993cccc2c
basic updates to the reamdme
2016-05-31 19:15:29 +03:00
Amin Mkh
1090bb4db6
added mongodb driver for php5.5 5.6
2016-05-30 23:26:40 +03:00
Amin Mkh
9c7054abe2
added mongodb image + PHP7 driver
2016-05-29 14:19:43 +03:00
Mahmoud Zalt
e7decdaaf7
add debugging section to the readme
2016-05-28 11:04:05 +03:00
Mahmoud Zalt
18bf12bfde
Merge pull request #74 from abyshakes/master
...
Issue #73 unable to install workspace container
2016-05-26 21:17:51 +03:00
Abhishek Prabhu
d829482a06
Issue #73 unable to install workspace container
2016-05-25 22:33:29 +05:30
Mahmoud Zalt
86c6389650
Merge pull request #70 from Gummibeer/patch-2
...
Issue #69
2016-05-24 19:49:35 +03:00
Tom Witkowski
991e28046d
Issue #69
...
add memcached to php-cli
2016-05-24 16:44:52 +02:00
Mahmoud Zalt
ccbc73c6bc
update the readme file
2016-05-24 14:01:07 +03:00
Mahmoud Zalt
246c7366ba
Merge pull request #68 from Gummibeer/patch-1
...
Issue #67
2016-05-24 13:23:13 +03:00
Tom Witkowski
762e2ec07b
Issue #67
...
Issue #67
simpler docker IP-Address get command
2016-05-24 11:54:07 +02:00
Mahmoud Zalt
adaaa25f47
remove the Laravel installer from the workspace container
2016-05-23 23:32:59 +03:00
Mahmoud Zalt
11a13a0c33
Merge pull request #66 from AminMkh/workspace-postgres-driver
...
added postgres driver
2016-05-23 23:24:27 +03:00
Amin Mkh
c642560993
added postgres driver
...
added postgres driver to workspace container.
2016-05-23 23:20:07 +03:00
Mahmoud Zalt
ea9f5c635f
Merge pull request #64 from AminMkh/master
...
Update docker-compose.yml
2016-05-23 23:00:09 +03:00
Amin Mkh
fd4253afb6
Update docker-compose.yml
2016-05-23 22:23:10 +03:00
Mahmoud Zalt
73310e45e8
Merge pull request #62 from AminMkh/master
...
Update README.MD
2016-05-23 21:53:55 +03:00
Amin Mkh
7f91fc9798
Update README.MD
2016-05-23 21:45:38 +03:00
Mahmoud Zalt
a8a7685a40
basic changes to the readme format
2016-05-21 19:19:03 +03:00
Mahmoud Zalt
06c4c19a6f
replace official neo4j image with tpires/neo4j
...
because of this wired error
(https://github.com/neo4j/docker-neo4j/issues/33 )
2016-05-20 21:21:19 +03:00
Mahmoud Zalt
8bff7656f6
add neo4j support to the readme file
2016-05-20 20:37:00 +03:00
Mahmoud Zalt
5c9eb97db5
Support Neo4j DB (beta)
2016-05-20 20:35:10 +03:00
Mahmoud Zalt
588819ab6d
turn errors and access logs on by default for nginx
2016-05-20 20:32:33 +03:00
Mahmoud Zalt
170b63a3ba
edit redis volume
2016-05-20 09:26:29 +03:00
Mahmoud Zalt
19813e48c3
add demo video to the readme
2016-05-20 09:24:26 +03:00
Mahmoud Zalt
be7b8ee056
update the readme (installation steps)
2016-05-19 21:40:25 +03:00
Mahmoud Zalt
01a056dd25
make the workspace container run automatically
2016-05-19 20:49:16 +03:00
Mahmoud Zalt
70e1b0fe41
update readme file
2016-05-19 18:04:53 +03:00
Mahmoud Zalt
0959b25c05
add sqlite support to the readme
2016-05-19 03:42:36 +03:00
Mahmoud Zalt
1d8336a9e1
add cleaning to free some space during provisioning the workspace
...
Fixing E: You don't have enough free space in /var/cache/apt/archives/
2016-05-19 03:25:02 +03:00
Mahmoud Zalt
f0e2d83618
add sqlite in the workspace
...
it could be removed to it’s own container later
2016-05-19 03:06:34 +03:00
Mahmoud Zalt
7f1deb0342
update how to get IP address on Linux, in the readme
2016-05-19 02:49:07 +03:00
Mahmoud Zalt
703887a2a6
add Node, Gulp and Bower to the readme
2016-05-18 22:54:46 +03:00
Mahmoud Zalt
84e6b2b6ff
Merge pull request #52 from mattythebatty/add-npm-bower-gulp
...
Install node, npm, gulp and bower to the workspace container
2016-05-18 22:49:31 +03:00
matt
c3ff9e485b
Install node, npm, gulp and bower to the workspace container
2016-05-18 20:20:16 +01:00
Mahmoud Zalt
77f9183c83
reformat the readme file (organize all the sections)
2016-05-18 20:56:48 +03:00
Mahmoud Zalt
378181044c
update readme file
...
- Add “Change the PHP-CLI Version”
- Add “Install PHP Extensions”
2016-05-18 20:21:15 +03:00
Mahmoud Zalt
01bdaae690
Add "Run Artisan Commands" to the readme
2016-05-18 11:48:02 +03:00
Mahmoud Zalt
68aca9f8f9
small updates to the readme file
2016-05-18 11:24:13 +03:00
Mahmoud Zalt
6d0ecaecf4
general updates to the readme files
2016-05-18 11:17:58 +03:00
Mahmoud Zalt
a434588a66
Merge pull request #50 from LaraDock/develop
...
Develop
2016-05-18 11:14:59 +03:00
Mahmoud Zalt
5aa01b1757
add the new way of using LaraDock in the readme
2016-05-18 11:12:21 +03:00
Mahmoud Zalt
3b2831bf1d
add alias for phpunit in the .bashrc
2016-05-18 10:25:54 +03:00
Mahmoud Zalt
7171996843
replace composer path
2016-05-18 09:05:45 +03:00
Mahmoud Zalt
66f08a4f60
fix .bashrc exports and alises
2016-05-18 08:40:08 +03:00
Mahmoud Zalt
07a07ab3ac
install php xml in the workspace container
2016-05-18 08:23:53 +03:00
Mahmoud Zalt
fb4fcdcb23
Install the Laravel Installer in the workspace container
2016-05-18 08:07:54 +03:00
Mahmoud Zalt
a69681b07c
install the php zip extention in the workspace
2016-05-18 07:58:33 +03:00
Mahmoud Zalt
2c05c87400
update the logs section
2016-05-18 07:56:12 +03:00
Mahmoud Zalt
16a1041ef5
clean the workspace container
2016-05-18 07:53:14 +03:00
Mahmoud Zalt
5ef193d55b
update readme
2016-05-18 07:16:20 +03:00
Mahmoud Zalt
4d8a798224
Create Application Container to hold App code
2016-05-18 07:13:19 +03:00
Mahmoud Zalt
1574231a80
replace ubuntu 16.04 with lighter ubuntu version
2016-05-18 07:11:49 +03:00
Mahmoud Zalt
6eb3a9bd5f
fix nginx not connecting to php port 9000
2016-05-18 06:29:33 +03:00
Mahmoud Zalt
377f24fe2b
keep workspace container alive with tty
2016-05-18 06:28:31 +03:00
Mahmoud Zalt
51b6d4f844
update readme file (php section)
2016-05-18 04:38:46 +03:00
Mahmoud Zalt
97500508f5
reformat the workspace Dockerfile
2016-05-18 03:54:21 +03:00
Mahmoud Zalt
7dcf481d21
install nano in the workspace container
2016-05-18 02:54:35 +03:00
Mahmoud Zalt
efd062fd88
fix linking containers to php-fpm instead of php
2016-05-18 02:54:23 +03:00
Mahmoud Zalt
504c9c59d5
Create workspace container
...
the workspace container is based from Ubuntu 16.04
it includes PHP-CLI 7 - Git - cURL and Vim for now
2016-05-18 02:46:27 +03:00
Mahmoud Zalt
4edf941872
rename php to php-fpm
...
preparing to add php cli as part of the workspace container
2016-05-18 02:43:23 +03:00
Mahmoud Zalt
36b49f5ae2
formatting and small updates
2016-05-17 23:47:26 +03:00
Mahmoud Zalt
e49836ba90
Merge pull request #48 from appleboy/patch-1
...
Replace docker-compose rm with down command.
2016-05-17 17:35:12 +03:00
Bo-Yi Wu
84f766363d
Replace docker-compose rm with down command.
2016-05-17 10:50:51 +08:00
Mahmoud Zalt
03c991c89d
Merge pull request #47 from mattythebatty/php-5-memcached
...
Add memcached support for PHP 5.5 & 5.6
2016-05-14 19:47:37 +03:00
matt
fdba7e7c09
add memcached support for PHP 5.5 & 5.6
2016-05-14 17:21:36 +01:00
Mahmoud Zalt
405067d4af
Separate the PHP versions to multiple dockerfiles
...
Because there's some difference in installing some libraries
between PHP 5 and PHP 7. There must be multiple php dockerfiles.
For that I created 3 docker files each of a different version,
this will make it easy for the users to switch between the PHP
version by just editing the docker-compose file and not touching
the dockerfiles.
2016-05-14 04:50:47 +03:00
Mahmoud Zalt
7f4e411d3d
link containers to PHP
2016-05-14 04:20:20 +03:00
Mahmoud Zalt
e946573d75
general updates to the readme file
2016-05-13 02:00:25 +03:00
Mahmoud Zalt
470873acd2
add Memcached support to the readme file
2016-05-12 15:23:42 +03:00
Mahmoud Zalt
88d5dd7806
Merge pull request #44 from mattythebatty/memcached-support
...
Memcached support
2016-05-12 15:12:46 +03:00
matt
295a0974da
install php memcached
2016-05-12 02:28:44 +01:00
matt
cf89670671
add memcached support
2016-05-12 02:17:39 +01:00
Mahmoud Zalt
40899bc40f
remove the duplicated volumes from DBs dockerfiles
2016-05-09 15:53:16 +03:00
Mahmoud Zalt
64bf3222af
set php work directory to laravel's directory
2016-05-09 15:45:54 +03:00
Mahmoud Zalt
79009cc97e
Merge branch 'benmag-master'
...
* benmag-master:
Install pdo_pgsql extension
2016-05-09 14:59:13 +03:00
benmag@users.noreply.github.com
571bf64eb2
Install pdo_pgsql extension
2016-05-09 13:08:08 +10:00
benmag@users.noreply.github.com
75b1705820
Merge remote-tracking branch 'LaraDock/master'
2016-05-09 12:09:57 +10:00
Mahmoud Zalt
12587bc712
Support Beanstalkd and Beanstalkd Console
...
Closes feature #38
2016-05-09 05:02:15 +03:00
Mahmoud Zalt
81f2602464
Support MariaDB
...
closes feature #21
2016-05-09 04:23:03 +03:00
Mahmoud Zalt
ecefee4d65
update postgres volume path
2016-05-09 04:20:03 +03:00
Mahmoud Zalt
de8cbb0605
simple updates to docker compose and readme
2016-05-08 15:21:59 +03:00
Mahmoud Zalt
5190da831a
remove containers names from docker-compose
...
to void conflict while scalling using the scale command
2016-05-08 13:39:43 +03:00
Mahmoud Zalt
fdaa983e77
update readme, put requirements in table
2016-05-08 11:25:43 +03:00
Mahmoud Zalt
e52f8f5613
update readme file, add more details on linux
2016-05-08 10:54:10 +03:00
Mahmoud Zalt
f9c13090c6
general updates to the readme file
2016-05-07 19:59:59 +03:00
Mahmoud Zalt
bfa0d54b5a
add features list to the readme file
2016-05-07 19:51:45 +03:00
Mahmoud Zalt
7f80888fc1
add more info to the readme file
2016-05-07 18:48:27 +03:00
benmag@users.noreply.github.com
aa338d534e
Merge remote-tracking branch 'LaraDock/master'
2016-05-07 14:53:55 +10:00
Mahmoud Zalt
31793a3cc9
general updates to the readme file
2016-05-07 05:58:20 +03:00
Mahmoud Zalt
5d84c6481f
revers the dependancies between php and the db
...
to prevent running all the db engines when php is running
2016-05-07 05:29:48 +03:00
Mahmoud Zalt
26229e150d
Merge pull request #35 from benmag/master
...
link postgres service to php service
2016-05-07 05:14:01 +03:00
benmag@users.noreply.github.com
ab7f3d8fd9
Merge remote-tracking branch 'LaraDock/master'
2016-05-07 12:12:43 +10:00
Mahmoud Zalt
2b98b0b82e
update the readme, include supported containers
2016-05-07 05:10:57 +03:00
Mahmoud Zalt
457c5d4b1b
update the readme file
...
Support selecting your own containers in the docker compose command.
2016-05-07 05:03:07 +03:00
benmag@users.noreply.github.com
cd97ac0aa6
link postgres service to php service
2016-05-07 11:55:00 +10:00
Mahmoud Zalt
22f11e03ee
Merge pull request #34 from benmag/master
...
Add support for postgres
2016-05-07 04:34:27 +03:00
benmag@users.noreply.github.com
5d62ec1e67
Add support for postgres
2016-05-07 11:16:06 +10:00