e23c6dae90
Merge pull request #717 from zeroc0d3/proxy
...
Merge with Proxy branch
2017-04-03 09:54:27 -04:00
b58f859eff
Merge branch 'master' into proxy
2017-03-31 16:42:30 +07:00
170a1efeb1
Merge pull request #727 from partounian/master
...
Add Adminer container
2017-03-31 00:35:40 -04:00
50e3d1667f
Merge pull request #726 from innerspirit/master
...
Fixed typo
2017-03-31 00:30:31 -04:00
269732d8ea
Remove comment about requiring nginx/fastcgi
2017-03-30 18:25:29 -07:00
a11206d4ba
Change adminer expose port to 8080
...
Most webservers default to 80, but Adminer's docker container runs on 8080.
2017-03-30 18:19:06 -07:00
cb78a6c3d6
Merge pull request #1 from innerspirit/doc-typo
...
Fixed typo
2017-03-30 17:27:27 -03:00
662280c139
Fixed typo
2017-03-30 17:26:20 -03:00
68dd2fd019
Switch from adminer:fastcgi to adminer:latest
...
This is to allow standalone usage.
2017-03-29 22:50:01 -07:00
c193c5d03b
Correct Adminer repo
2017-03-29 22:29:18 -07:00
4efb5b43c6
Add Adminer to docs
2017-03-29 22:23:49 -07:00
3d2eb81cd5
Add necessary Adminer config below PMA sections
2017-03-29 22:13:33 -07:00
a8d7937889
Add ADM_PORT to env-example
2017-03-29 22:12:53 -07:00
98c9fdff24
Create Adminer dockerfile
2017-03-29 22:04:59 -07:00
f05512fd1d
update readme
2017-03-29 10:08:55 -04:00
fc460f9497
Remove duplicate mssql & remove network setup for balancer
2017-03-29 13:59:53 +07:00
1fd55d98e1
Changing map network in docker-compose file
2017-03-26 16:31:18 +07:00
4f5746f2a7
Refactoring Maintainer Docker File
2017-03-26 14:56:55 +07:00
3d90a806fa
Merge branch 'proxy' of github.com:zeroc0d3/docker-laradock into proxy
2017-03-26 12:33:48 +07:00
cf9abcd5b8
Change env-example varnish backend host to 'workspace'
2017-03-26 12:33:27 +07:00
e1036185ae
Fixing from #708 ( #715 )
...
* Fixing workspace_yarn_version
* Remove duplicate type MAINTAINER
* Update README.md
2017-03-26 10:47:03 +08:00
d1af24736b
Merge branch 'master' into proxy
2017-03-25 21:40:37 -04:00
236665d7d3
Change haproxy port to 8085
2017-03-26 08:13:14 +07:00
c340d851d3
Add mssql volumes
2017-03-26 07:30:59 +07:00
38545cfffd
Update env-example for mssql
2017-03-26 07:28:04 +07:00
bf19ecffcb
Fixing conflict & add mssql
2017-03-26 07:20:24 +07:00
6fa6d02360
Merge pull request #712 from cabrerabywaters/MSSQL_DATABASE_SUPPORT
...
adding MsSQL DATABASE support
2017-03-25 16:55:34 -04:00
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
5d5545ec9e
Update README.md
2017-03-25 20:51:24 +07:00
d152050e29
Update README.md
2017-03-25 20:50:35 +07:00
a0da2c0ea0
Update readme
...
Add @zeroc0d3 to the maintainers team :)
2017-03-24 19:54:36 -04:00
2e86243d88
Update docker-compose.yml
2017-03-24 13:49:38 -03:00
6b61c7d454
adding MSSQL support
2017-03-24 12:31:38 -03:00
3881a5d66d
Remove duplicate type MAINTAINER
2017-03-24 10:13:16 +07:00
69b223a370
Remove duplicate type MAINTAINER
2017-03-24 10:12:42 +07:00
894cb6ea27
🐛 fix yarn again after #662 reverted it
...
#706
2017-03-23 11:51:59 +01:00
b81e3e8f15
Fixing workspace_yarn_version
2017-03-23 16:32:11 +07:00
7d49f9b820
Fixing workspace_yarn_version
2017-03-23 16:07:59 +07:00
9dad1586af
Fixing identitation for docker-compose haproxy
2017-03-23 15:01:32 +07:00
d60178f598
Add expose port for varnish
2017-03-23 14:07:25 +07:00
5d74e10b08
Update docker compose file for load balancer
2017-03-23 13:53:52 +07:00
40422ab4b0
Update environment for varnish & haproxy
2017-03-23 13:53:26 +07:00
b35a23d89e
Add docker file varnish
2017-03-23 13:52:30 +07:00
3445b5b1b6
Add docker file haproxy
2017-03-23 13:52:11 +07:00
8315a3872d
Merge pull request #662 from zeroc0d3/master
...
Fixing environment in docker-compose file
2017-03-22 10:14:00 -04:00
6abea8746c
Merge branch 'master' into master
2017-03-22 11:43:53 +07:00
09c5ad273c
re-position `COMPOSE_CONVERT_WINDOWS_PATHS`
2017-03-21 10:06:26 -04:00
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
4f416da26b
add missing env variable `APPLICATION`
...
closes #703
2017-03-21 10:01:37 -04:00
53b73798d3
Merge pull request #704 from Mvzundert/master
...
Fixed path variable for windows users
2017-03-21 09:59:57 -04:00
Mahmoud Zalt