Commit Graph

795 Commits

Author SHA1 Message Date
ZeroC0D3 Team
3d90a806fa Merge branch 'proxy' of github.com:zeroc0d3/docker-laradock into proxy 2017-03-26 12:33:48 +07:00
ZeroC0D3 Team
cf9abcd5b8 Change env-example varnish backend host to 'workspace' 2017-03-26 12:33:27 +07:00
ZeroC0D3 Team
d1af24736b Merge branch 'master' into proxy 2017-03-25 21:40:37 -04:00
ZeroC0D3 Team
236665d7d3 Change haproxy port to 8085 2017-03-26 08:13:14 +07:00
ZeroC0D3 Team
c340d851d3 Add mssql volumes 2017-03-26 07:30:59 +07:00
ZeroC0D3 Team
38545cfffd Update env-example for mssql 2017-03-26 07:28:04 +07:00
ZeroC0D3 Team
bf19ecffcb Fixing conflict & add mssql 2017-03-26 07:20:24 +07:00
Mahmoud Zalt
6fa6d02360 Merge pull request #712 from cabrerabywaters/MSSQL_DATABASE_SUPPORT
adding MsSQL DATABASE support
2017-03-25 16:55:34 -04:00
Mahmoud Zalt
e588f261f8 Merge pull request #708 from thorerik/fix-yarn-again
fix yarn again after #662 reverted it
2017-03-25 16:55:17 -04:00
ZeroC0D3 Team
5d5545ec9e Update README.md 2017-03-25 20:51:24 +07:00
ZeroC0D3 Team
d152050e29 Update README.md 2017-03-25 20:50:35 +07:00
Mahmoud Zalt
a0da2c0ea0 Update readme
Add @zeroc0d3 to the maintainers team :)
2017-03-24 19:54:36 -04:00
Ignacio Cabrera
2e86243d88 Update docker-compose.yml 2017-03-24 13:49:38 -03:00
Ignacio Cabrera
6b61c7d454 adding MSSQL support 2017-03-24 12:31:38 -03:00
ZeroC0D3 Team
3881a5d66d Remove duplicate type MAINTAINER 2017-03-24 10:13:16 +07:00
ZeroC0D3 Team
69b223a370 Remove duplicate type MAINTAINER 2017-03-24 10:12:42 +07:00
Thor Erik Lie
894cb6ea27 🐛 fix yarn again after #662 reverted it
#706
2017-03-23 11:51:59 +01:00
ZeroC0D3 Team
b81e3e8f15 Fixing workspace_yarn_version 2017-03-23 16:32:11 +07:00
ZeroC0D3 Team
7d49f9b820 Fixing workspace_yarn_version 2017-03-23 16:07:59 +07:00
ZeroC0D3 Team
9dad1586af Fixing identitation for docker-compose haproxy 2017-03-23 15:01:32 +07:00
ZeroC0D3 Team
d60178f598 Add expose port for varnish 2017-03-23 14:07:25 +07:00
ZeroC0D3 Team
5d74e10b08 Update docker compose file for load balancer 2017-03-23 13:53:52 +07:00
ZeroC0D3 Team
40422ab4b0 Update environment for varnish & haproxy 2017-03-23 13:53:26 +07:00
ZeroC0D3 Team
b35a23d89e Add docker file varnish 2017-03-23 13:52:30 +07:00
ZeroC0D3 Team
3445b5b1b6 Add docker file haproxy 2017-03-23 13:52:11 +07:00
Mahmoud Zalt
8315a3872d Merge pull request #662 from zeroc0d3/master
Fixing environment in docker-compose file
2017-03-22 10:14:00 -04:00
ZeroC0D3 Team
6abea8746c Merge branch 'master' into master 2017-03-22 11:43:53 +07:00
Mahmoud Zalt
09c5ad273c re-position COMPOSE_CONVERT_WINDOWS_PATHS 2017-03-21 10:06:26 -04:00
Mahmoud Zalt
99b8a45f3b Merge branch 'master' of https://github.com/Laradock/laradock
* 'master' of https://github.com/Laradock/laradock:
  Fixed path variable for windows users
  fixes up so Yarn is installable again
  align file format
  for file format
  use '`' to quote identifier
  use CREATE USER to define account authentication characteristics
  use CREATE USER to define account authentication characteristics
  Updated project example confs to fit nameing convention used in apache example
  Updated project example confs to not have gitignore issues
  docker-71 file now also works with new env-example setup
  Adding Arg to docker-compose
  Adding MSSQL Support
2017-03-21 10:02:10 -04:00
Mahmoud Zalt
4f416da26b add missing env variable APPLICATION
closes #703
2017-03-21 10:01:37 -04:00
Mahmoud Zalt
53b73798d3 Merge pull request #704 from Mvzundert/master
Fixed path variable for windows users
2017-03-21 09:59:57 -04:00
Marius van Zundert
c6e9b1ed5d Fixed path variable for windows users 2017-03-21 11:21:26 +01:00
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