Max Mekenya
96c1d7c59c
Update supervisord.conf
...
We have project in `/var/www` by default, not in `/var/www/laravel`
https://github.com/laradock/laradock/issues/731
2017-04-03 15:30:41 +10:00
Mahmoud Zalt
170a1efeb1
Merge pull request #727 from partounian/master
...
Add Adminer container
2017-03-31 00:35:40 -04:00
Mahmoud Zalt
50e3d1667f
Merge pull request #726 from innerspirit/master
...
Fixed typo
2017-03-31 00:30:31 -04:00
Patrick Artounian
269732d8ea
Remove comment about requiring nginx/fastcgi
2017-03-30 18:25:29 -07:00
Patrick Artounian
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
Christian Maioli (@christianmaioli)
cb78a6c3d6
Merge pull request #1 from innerspirit/doc-typo
...
Fixed typo
2017-03-30 17:27:27 -03:00
Christian Maioli (@christianmaioli)
662280c139
Fixed typo
2017-03-30 17:26:20 -03:00
Patrick Artounian
68dd2fd019
Switch from adminer:fastcgi to adminer:latest
...
This is to allow standalone usage.
2017-03-29 22:50:01 -07:00
Patrick Artounian
c193c5d03b
Correct Adminer repo
2017-03-29 22:29:18 -07:00
Patrick Artounian
4efb5b43c6
Add Adminer to docs
2017-03-29 22:23:49 -07:00
Patrick Artounian
3d2eb81cd5
Add necessary Adminer config below PMA sections
2017-03-29 22:13:33 -07:00
Patrick Artounian
a8d7937889
Add ADM_PORT to env-example
2017-03-29 22:12:53 -07:00
Patrick Artounian
98c9fdff24
Create Adminer dockerfile
2017-03-29 22:04:59 -07:00
Mahmoud Zalt
f05512fd1d
update readme
2017-03-29 10:08:55 -04:00
ZeroC0D3 Team
e1036185ae
Fixing from #708 ( #715 )
...
* Fixing workspace_yarn_version
* Remove duplicate type MAINTAINER
* Update README.md
2017-03-26 10:47:03 +08: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
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
Thor Erik Lie
894cb6ea27
🐛 fix yarn again after #662 reverted it
...
#706
2017-03-23 11:51:59 +01: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
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
