ZeroC0D3 Team
4973dd93be
Merge branch 'master' into master
2017-03-21 04:09:11 +07:00
Mahmoud Zalt
9096737aa7
Merge pull request #694 from Mvzundert/master
...
Docker-71 and Nginx examples
2017-03-20 13:22:49 -04:00
Mahmoud Zalt
3429681f2c
Merge pull request #670 from cabrerabywaters/MSSQL_SUPPORT
...
Mssql support
2017-03-20 13:20:08 -04:00
Mahmoud Zalt
d4c727bb2d
Merge pull request #700 from picospuch/master
...
fix some errors in mysql setup file for latest mysql image
2017-03-20 13:16:05 -04:00
Mahmoud Zalt
1ae104167a
Merge pull request #701 from thorerik/fix-yarn
...
Fix yarn installation
2017-03-20 13:15:39 -04:00
Thor Erik Lie
8869b22a1d
fixes up so Yarn is installable again
2017-03-20 10:33:25 +01:00
spuch
1650af04cd
align file format
2017-03-20 15:41:03 +08:00
spuch
bdcc2adf3f
for file format
2017-03-20 15:40:07 +08:00
spuch
570be592bb
use '`' to quote identifier
2017-03-20 15:36:58 +08:00
spuch
d94de05fd4
use CREATE USER to define account authentication characteristics
2017-03-20 15:06:45 +08:00
spuch
69c180d2e8
use CREATE USER to define account authentication characteristics
2017-03-20 15:01:16 +08:00
Ignacio Cabrera
134911843a
Merge branch 'master' into MSSQL_SUPPORT
2017-03-18 19:11:01 -03:00
ZeroC0D3 Team
d31ccbd268
Conflict resolved docker-compose file
2017-03-18 08:29:14 +07:00
ZeroC0D3 Team
2bbe39cf4a
Merge branch 'master' into master
2017-03-18 07:52:45 +07:00
Marius van Zundert
4588685e97
Updated project example confs to fit nameing convention used in apache example
2017-03-17 19:34:32 +01:00
Marius van Zundert
4b2ddfad20
Updated project example confs to not have gitignore issues
2017-03-17 19:32:45 +01:00
Marius van Zundert
516b148dae
Merge branch 'master' of github.com:laradock/laradock
2017-03-17 16:56:14 +01:00
Marius van Zundert
0c53eadf34
docker-71 file now also works with new env-example setup
2017-03-17 16:55:53 +01:00
Mahmoud Zalt
3e61554625
Merge pull request #687 from jefhar/jefhar-patch-1
...
Jefhar patch 1
2017-03-17 11:09:45 -04:00
Mahmoud Zalt
6054c2d250
Merge pull request #686 from cjmaxik/patch-3
...
Update Dockerfile-71
2017-03-17 11:08:29 -04:00
Mahmoud Zalt
5589a12b9d
Merge pull request #691 from davidtaboas/patch-1
...
Fix Dockerfile-70
2017-03-17 11:07:36 -04:00
Mahmoud Zalt
e2384e2722
Merge pull request #689 from picospuch/patch-1
...
Update env-example
2017-03-17 11:07:21 -04:00
Mahmoud Zalt
d077085595
Merge pull request #688 from Mvzundert/master
...
re-added .gitignore for nginx dir, still do not want configs in git
2017-03-17 11:07:06 -04:00
Mahmoud Zalt
53f1032975
Merge pull request #673 from cabrerabywaters/PHP_WORKER
...
Php worker
2017-03-17 11:05:53 -04:00
Mahmoud Zalt
875ec23ade
Merge pull request #661 from g9308370/add_apache_vhost_conf
...
Add apache2 vhost & example
2017-03-17 11:01:10 -04:00
David Táboas
cee9de7ed1
Fix Dockerfile-70
...
Add ;fi to end if INSTALL_INTL block
2017-03-17 10:10:32 +01:00
g9308370
badad156e1
Merge branch 'master' into add_apache_vhost_conf
2017-03-17 16:37:59 +08:00
picospuch
8e89725381
Update env-example
2017-03-17 16:37:42 +08:00
ZeroC0D3 Team
2219177eac
Merge branch 'master' into master
2017-03-17 14:54:06 +07:00
Marius van Zundert
baf29b1223
re-added .gitignore for nginx dir, still do not want configs in git
2017-03-17 08:48:47 +01:00
ZeroC0D3 Team
5c0933d19a
Merge with master branch
2017-03-17 14:36:00 +07:00
ZeroC0D3 Team
8de9eca8ae
Fixing the docker-compose.yml
2017-03-17 13:57:54 +07:00
ZeroC0D3 Team
d172180660
Add constant PHP_FPM_INSTALL_INTL=false & APPLICATION
2017-03-17 13:53:04 +07:00
ZeroC0D3 Team
9f78b17fd1
Fixing indent_size=2 from 4
2017-03-17 13:52:19 +07:00
ZeroC0D3 Team
f5e33fb396
Update .gitignore file
2017-03-17 13:49:21 +07:00
Mahmoud Zalt
9ae6e45dda
Merge branch 'master' of https://github.com/Laradock/laradock
...
* 'master' of https://github.com/Laradock/laradock :
Update docker-compose.yml
intl support
2017-03-17 02:46:35 -04:00
Mahmoud Zalt
94d88e91c5
add missing steps to the docs
2017-03-17 02:46:19 -04:00
jefhar
8b4901ce57
Closed if
...
Closed if [] ;fi in Human Language and Character Encoding Support:
2017-03-16 23:28:29 -07:00
jefhar
08086be4c5
PHP_FPM_INSTALL_INTL env-example
...
added PHP_FPM_INSTALL_INTL=false to PHP_FPM_INSTALL_INTL=false
2017-03-16 23:26:54 -07:00
Ignacio Cabrera
f2805bca52
Update docker-compose.yml
2017-03-16 22:21:26 -03:00
Ignacio Cabrera
033e1b8721
Merge branch 'master' into PHP_WORKER
2017-03-16 21:59:28 -03:00
Mahmoud Zalt
9e290ffddb
Merge pull request #680 from cjmaxik/feature-intl
...
Adding intl support to php-fpm container
2017-03-16 20:57:47 -04:00
Mahmoud Zalt
6ada2f1b91
nginx samples sites for multiple projects
...
- add `project-1.conf` and `project-1.conf` to match the docs.
- keep default to work with both multiple and single projects.
- delete the .gitignore.
- update docker-compose and example-env file to match the new settings
- update the docs
- delete `laravel-https.conf` to replace it with documentation instead
2017-03-16 20:53:14 -04:00
Max Mekenya
c6e393f5ce
Update Dockerfile-71
...
We have already 7.1 image builded. + intl and ghostscript support
https://github.com/laradock/laradock/pull/672
https://github.com/laradock/laradock/pull/680
2017-03-17 10:32:04 +10:00
Max Mekenya
4e443cec09
Merge branch 'master' into feature-intl
2017-03-17 10:08:21 +10:00
Ignacio Cabrera
528b60eb17
fixing Volumes and Workdir
2017-03-16 21:03:04 -03:00
Mahmoud Zalt
aedc7c8438
edit the docs
2017-03-16 19:28:01 -04:00
Mahmoud Zalt
ec4ccb4a20
Move CNAME from the docs to the DOC..
2017-03-16 18:33:29 -04:00
Mahmoud Zalt
de6040a14d
move the documentation markdown files outside the generated html folder
2017-03-16 17:44:14 -04:00
Mahmoud Zalt
e0e4616ae0
update installation steps in the docs (.env)
2017-03-16 17:03:05 -04:00