Commit Graph

1816 Commits

Author SHA1 Message Date
Mahmoud Zalt
3e4a5edc64 Merge pull request #407 from michaeljhopkins/patch-2
Add solution to mysql connection issues
2016-11-05 18:52:53 -04:00
Michael Hopkins
9289c1b6c0 Add solution to mysql connection issues
Adding in a more "docker conventional" solution to the mysql connection issues
2016-11-05 06:42:19 -06:00
Bo-Yi Wu
3f157a3277 Merge pull request #403 from darthrevan13/patch-1
Fix for mariadb local path
2016-11-03 23:02:16 +08:00
Mahmoud Zalt
f732bb283b update the workspace container version 2016-11-03 09:50:21 -04:00
Mahmoud Zalt
ca4aeada08 add missing step to the docs 2016-11-03 09:50:10 -04:00
darthrevan13
3d54d68aa1 Fix for mariadb local path
When running docker-compose with mariadb the following message will appear:

ERROR: for mariadb  Cannot create container for service mariadb: Invalid volume spec "mariadb": Invalid volume destination path: 'mariadb' mount path must be absolute.
ERROR: Encountered errors while bringing up the project.

This commit fixes the issue.
2016-11-03 15:45:59 +02:00
Bo-Yi Wu
a0153810c6 remove laradock logo on zh document.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-11-02 13:43:45 +08:00
Mahmoud Zalt
4fe15ad5cf update docs 2016-11-01 10:07:21 -04:00
Mahmoud Zalt
146f8ea6f4 rename volumes_source to applications 2016-11-01 10:05:10 -04:00
Mahmoud Zalt
9ab6d8fa15 remove volumes container 2016-11-01 10:03:47 -04:00
Bo-Yi Wu
f6d9ac6853 Merge pull request #401 from dsampaolo/fix-phpunit-path-missing
fix #395 adds phpunit path to non-root user's .bashrc
2016-11-01 15:51:10 +08:00
Didier Sampaolo
470994fc23 fix #395 adds phpunit path to non-root user's .bashrc 2016-11-01 07:19:58 +01:00
Mahmoud Zalt
1b05dfd1e2 replace var/www/laravel with var/www 2016-10-31 21:45:50 -04:00
Mahmoud Zalt
03bba8d2de Merge pull request #400 from LaraDock/appleboy-patch-1
fix phpunit path for multiple project.
2016-10-31 21:32:33 -04:00
Bo-Yi Wu
b6c7746a0d fix workdir path.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-11-01 09:23:40 +08:00
Bo-Yi Wu
e7baf3cfc3 fix phpunit path 2016-11-01 09:00:19 +08:00
Mahmoud Zalt
f630970151 remove ./databases:/docker-entrypoint-initdb.d until it works 2016-10-31 20:46:02 -04:00
Mahmoud Zalt
3070eac7b7 Merge pull request #399 from LaraDock/multiple-projects
Multiple projects
2016-10-31 20:32:44 -04:00
Mahmoud Zalt
66723c0278 update the doc to support multiple projects 2016-10-31 20:30:34 -04:00
Mahmoud Zalt
dbee864d44 rename laravel.conf to default and add sample conf 2016-10-31 19:50:30 -04:00
Mahmoud Zalt
739cc31f4c change app mapping directory from www/laravel to www
also add sample to show facilitate setup for multiple sites
2016-10-31 19:49:48 -04:00
Mahmoud Zalt
28130c5907 delete site_a and site_b nginx config samples 2016-10-31 19:31:15 -04:00
Mahmoud Zalt
658d4e7532 add root access section to mysql docs 2016-10-31 19:30:12 -04:00
Mahmoud Zalt
5da4058613 delete the drupal sample nginx config file 2016-10-31 19:28:47 -04:00
Mahmoud Zalt
2ed09f42ca change workspace and php-fpm work directories
making them compatible with multiple projects
2016-10-31 19:28:25 -04:00
Mahmoud Zalt
6ee790c26d Add support for Codeigniter 2016-10-31 12:21:01 -04:00
Mahmoud Zalt
a1ade52cd6 Merge pull request #369 from LaraDock/patch
fixed #363 PHP_IDE_CONFIG variable.
2016-10-31 08:08:48 -04:00
Mahmoud Zalt
05f4f371fe Merge pull request #396 from LaraDock/appleboy-patch-1
Update caddy version and fix format.
2016-10-31 08:05:45 -04:00
Bo-Yi Wu
33e99ca9cf update format. 2016-10-31 14:58:39 +08:00
Bo-Yi Wu
e913fd941e Update caddy version and fix format. 2016-10-31 14:36:44 +08:00
Bo-Yi Wu
5286fd654a remove redundant spaces 2016-10-31 14:33:57 +08:00
Mahmoud Zalt
499342ea39 Merge pull request #391 from hopewise/master
clarified where to run xdebugPhpFpm command
2016-10-26 19:59:09 -04:00
Samir Sabri
17442db357 clarified where to run xdebugPhpFpm command
As users might run the command `xdebugPhpFpm`  in the php-fpm container rather than from outside.
2016-10-26 15:21:18 +03:00
Bo-Yi Wu
4f7b0ec0c3 Merge pull request #390 from LaraDock/elasticsearch
Add install elasticsearch plugin section.
2016-10-26 11:16:00 +08:00
Bo-Yi Wu
a0981aa836 Add install elasticsearch plugin section.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-10-26 09:40:53 +08:00
Mahmoud Zalt
6a3137fc27 Merge pull request #388 from philtrep/ssh-documentation
Added Documentation for using ssh on workspace
2016-10-24 16:47:59 -04:00
philtrep
4d5e3e5e4a Added Documentation for using ssh on workspace 2016-10-24 16:11:52 -04:00
Philippe Trépanier
aa7c52c42e Merge pull request #386 from dilone/master
update Workspace port to 2222
2016-10-24 14:44:08 -04:00
Dilone
6eed8199df update port to 2222 - no conflict linux 2016-10-24 03:58:03 -04:00
Philippe Trépanier
c02f17417f Merge pull request #375 from calebfavor/apache-php-double-quote-fix
Removing double quotes for apache php fpm configuration.
2016-10-17 19:34:35 -04:00
calebfavor
91bae76527 No longer using env variable to set the apache php socket config variable. 2016-10-17 16:05:35 -07:00
calebfavor
891911ddc3 Removing double quotes for apache php fpm configuration. 2016-10-17 14:17:23 -07:00
Mahmoud Zalt
89fac4bdbe Merge pull request #371 from imamassi/master
Quick steps to resolve connection refused error
2016-10-16 22:59:19 -04:00
Imam Assidiqqi
22a3bbc0b0 Quick steps to resolve connection refused error 2016-10-16 07:51:49 +07:00
Bo-Yi Wu
89a21ccf1b fixed #363 PHP_IDE_CONFIG variable.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-10-15 08:50:17 +08:00
Philippe Trépanier
15892dba51 Merge pull request #367 from aletundo/Fix_mysql_dockerfile
Fixed mysql tag dockerfile
2016-10-14 16:12:19 -04:00
Alessandro Tundo
1fa1dc9a1c
Fixed mysql tag dockerfile
Signed-off-by: Alessandro Tundo <alessandrotundo94@gmail.com>
2016-10-14 21:04:24 +02:00
Mahmoud Zalt
c4cd3ed2ac Merge pull request #365 from geocine/nginx-charset-utf8
use utf8 charset on nginx
2016-10-14 14:31:56 -04:00
Aivan Monceller
ffe45fed50 use utf8 charset on nginx 2016-10-15 01:01:59 +08:00
Mahmoud Zalt
bd1f6ebd8a Merge pull request #364 from LaraDock/downgrade-mysql
downgrade MySQL to 5.6 (stable)
2016-10-14 12:28:42 -04:00