Commit Graph
37 Commits
Author SHA1 Message Date
ZeroC0D3 TeamandGitHub b58f859eff Merge branch 'master' into proxy 2017-03-31 16:42:30 +07:00
ZeroC0D3 Team fc460f9497 Remove duplicate mssql & remove network setup for balancer 2017-03-29 13:59:53 +07:00
ZeroC0D3 Team 1fd55d98e1 Changing map network in docker-compose file 2017-03-26 16:31:18 +07:00
ZeroC0D3 Team 4f5746f2a7 Refactoring Maintainer Docker File 2017-03-26 14:56:55 +07:00
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 TeamandBo-Yi Wu e1036185ae Fixing from #708 (#715)
* Fixing workspace_yarn_version

* Remove duplicate type MAINTAINER

* Update README.md
2017-03-26 10:47:03 +08:00
ZeroC0D3 TeamandGitHub 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
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
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
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
ZeroC0D3 TeamandGitHub 6abea8746c Merge branch 'master' into master 2017-03-22 11:43:53 +07:00
ZeroC0D3 TeamandGitHub 4973dd93be Merge branch 'master' into master 2017-03-21 04:09:11 +07:00
ZeroC0D3 Team d31ccbd268 Conflict resolved docker-compose file 2017-03-18 08:29:14 +07:00
ZeroC0D3 TeamandGitHub 2bbe39cf4a Merge branch 'master' into master 2017-03-18 07:52:45 +07:00
ZeroC0D3 TeamandGitHub 2219177eac Merge branch 'master' into master 2017-03-17 14:54:06 +07: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
ZeroC0D3 TeamandGitHub c88e690bb4 Merge branch 'master' into master 2017-03-10 08:09:07 +07:00
ZeroC0D3 Team c1de398acc Change default phpmyadmin environment for mysql 2017-03-10 07:53:33 +07:00
ZeroC0D3 Team 73f7c88122 Fixing environment in docker-compose file 2017-03-09 19:21:36 +07:00