Yu-Lung Shao (Allen)
7c9f9c1ecd
Merge pull request #1035 from bestlong/fix-caddy-service-build-failed
...
fix caddy service build failed
2017-06-29 00:22:03 -05:00
Shao Yu Lung
63152e11fa
fix caddy build failed
2017-06-29 12:47:29 +08:00
Yu-Lung Shao (Allen)
27c6de1fb1
Merge pull request #1033 from bestlong/fix-travis-ci-docker
...
Fix travis ci build failing
2017-06-28 21:15:07 -05:00
Shao Yu Lung
70e01125fd
fixing package docker-engine is not available.
2017-06-29 09:30:37 +08:00
Shao Yu Lung
26d7fb01ed
fixing package docker-engine is not available.
2017-06-29 09:25:24 +08:00
Winfried
d181a69a73
Merge pull request #1031 from macghriogair/master
...
[Fix] Mailhog should be exposed to backend
2017-06-28 18:33:44 +02:00
Winfried
106f8ec7af
Merge pull request #1029 from xsilen/patch-1
...
nginx sites-available shoule only use *.conf
2017-06-28 18:33:18 +02:00
Patrick Mac Gregor
1951834150
[Fix] Mailhog should be exposed to backend
...
- fixes failing connection to host "mailhog" when sending mail via smtp
- mailhog needs to be available for the backend at Port 1025
- i.e. in a Laravel app .env should contain "MAIL_HOST=mailhog
2017-06-28 11:28:04 +02:00
LinBo len
4c732aa5d6
nginx sites-available shoule only use *.conf
...
although most much of use case developer should modify laradock to suit their project. we can use *.conf.example to take effect.
but we also need a dummy nginx conf to info other newer to know how to config their nginx conf. the *.conf.example should be.
so i think we should only take *.conf to take effect. not *
2017-06-26 11:11:10 +08:00
ItaloBC
bbbd247653
ElasticSearch instance fails at loading (wrong)
...
ElasticSearch (ES from now onwards) will fail to initialize since the parameters for its environment are not correct or absent. These are:
* `cluster.name`: Name of the cluster itself
* `bootstrap.memory_lock`: Needed for ES to [lock the JVM into swap instead of memory](https://www.elastic.co/guide/en/elasticsearch/reference/master/_memory_lock_check.html ).
* `"ES_JAVA_OPTS=-Xms256m -Xmx256m"`: [Initial and maximum HEAP size for JVM](https://www.elastic.co/guide/en/elasticsearch/reference/current/_heap_size_check.html ). Since it's locked to disk, should be the same. Half the defaults (512m) for development.
* `ulimits: memlock: soft (-1), hard (-1)`: [ES needs to have unlimited access to memory](https://www.elastic.co/guide/en/elasticsearch/reference/current/max-size-virtual-memory-check.html ), otherwise it will feel sluggish.
* `mem_limit: 512m`: Hard limit the memory available for the container.
This can, and should, be changed using `.env` file variables, but it seems that this should suffice for basic ES development.
2017-06-14 14:19:47 -04:00
Winfried
c35445b066
Merge pull request #1015 from ardziej/patch-1
...
Set Timezone
2017-06-13 19:24:19 +02:00
Winfried
72198ed38c
Merge pull request #1008 from edmundluong/master
...
Set default setting to false for various Workspace installation options
2017-06-13 19:21:48 +02:00
Mahmoud Zalt
ab464d93d3
Merge pull request #1016 from ardziej/patch-2
...
Added TZ environment for MySQL Container
2017-06-13 05:59:59 +03:00
Michal Ardziejewski
e56587ec47
Added TZ environment for MySQL Container
2017-06-13 01:03:42 +02:00
Michal Ardziejewski
bbea2f0bab
Set Timezone
2017-06-13 00:55:05 +02:00
Winfried
9db39ad36f
Merge pull request #1014 from ItaloBC/patch-2
...
ElasticSearch - Change to official repository
2017-06-12 19:12:07 +02:00
Winfried
f009ba752b
Merge pull request #1013 from ItaloBC/patch-1
...
Kibana - Change to official repository
2017-06-12 19:11:54 +02:00
ItaloBC
03b551f9d6
Change to official repository
...
Elastic.co announced they will pull out their official images from the Docker Registry and user their own. There will be no updates starting 6/20/2017.
Pulling needs explicit version. Currently 5.4.1
2017-06-12 13:06:41 -04:00
ItaloBC
30df311ec2
Change to official repository
...
Elastic.co announced they will pull out their official images from the Docker Registry and user their own. There will be no updates starting 6/20/2017.
Pulling needs explicit version. Currently 5.4.1
2017-06-12 13:02:08 -04:00
Edmund Luong
262b9f20a3
Set default setting to false for the following options in workspace:
...
- Laravel Envoy
- Laravel Installer
- LinuxBrew
- MS SQL Server
2017-06-09 11:00:42 -04:00
Edmund Luong
3eb8fce4f9
Merge pull request #2 from laradock/master
...
Merge master
2017-06-09 10:58:08 -04:00
Mahmoud Zalt
05f8166bef
add PR template
2017-06-09 17:46:26 +03:00
Mahmoud Zalt
1bdf113767
update tools list in the docs
2017-06-09 17:33:10 +03:00
Edmund Luong
392960dc98
Merge pull request #1 from laradock/master
...
Merge master
2017-06-08 12:29:17 -04:00
Mahmoud Zalt
26ee54a4ad
Merge pull request #992 from zuohuadong/patch-3
...
git key to pull code
2017-06-07 09:42:47 +03:00
zuohuadong
cbfd160cbf
Fix
2017-06-06 18:11:31 +08:00
Bo-Yi Wu
7207ccbbeb
upgrade caddy to 0.10.3 version ( #994 )
2017-06-04 07:29:13 -05:00
Winfried
6e09e2a774
Merge pull request #964 from MyController/php56mssql
...
Dockerfile-56 fill missing MSSQL section
2017-06-04 12:15:36 +02:00
Mark Davidson
0561199914
Add Kibana Container ( #993 )
...
* Add Kibana Container
* Add Kibana Port to env-example
2017-06-02 23:54:37 -05:00
zuohuadong
430a5f21cf
git key to pull code
...
git key to pull code
2017-06-02 13:53:13 +08:00
mycontroller
0290142bf4
Dockerfile-56 fill missing MSSQL section
2017-05-31 13:41:30 +08:00
MyController
5745a50d15
Merge pull request #1 from laradock/master
...
跟进主干
2017-05-31 13:39:13 +08:00
Mahmoud Zalt
18b6c1b907
Merge pull request #984 from Obscuresounds/workspace-fix-bash-command-not-found
...
Exec issue with workspace bugfix
2017-05-30 17:51:05 +03:00
Mahmoud Zalt
4a663649c0
Merge pull request #983 from cre8/master
...
Add laravel echo server
2017-05-30 17:50:08 +03:00
Mahmoud Zalt
7c9d7a6de6
Merge pull request #965 from aven-li/master
...
fix mongodb php extension config
2017-05-30 17:49:33 +03:00
Mahmoud Zalt
d0e5d50712
Update readme
2017-05-30 17:41:11 +03:00
Lawrence Eldridge
d0c0a8895e
add global instance of larval installer for fresh projects. ( #988 )
2017-05-30 09:05:30 -05:00
Diego Vieira
e23ecb6a11
fix mssql startup ( #985 )
...
- Sleep 45s is invalid
- /opt/mssql/bin/sqlservr is the correct path for mssql binary
2017-05-30 09:05:09 -05:00
Mirko
da60b32a04
add laravel echo server
2017-05-27 15:24:50 +02:00
Lawrence Eldridge
5a47080859
This issue relates to https://github.com/laradock/laradock/issues/563 , which also occurs on Mac. This has been one of the solutions proposed.
2017-05-27 14:07:45 +01:00
Yu-Lung Shao (Allen)
f296a39bf5
Merge pull request #975 from bestlong/fix-jenkins-permission-denied
...
fix jenkins permission denied
2017-05-25 07:40:20 -05:00
Shao Yu Lung
f04acee6df
fix jenkins permission denied
2017-05-25 20:04:21 +08:00
Yu-Lung Shao (Allen)
992c76d29c
Merge pull request #974 from bestlong/adminer-support-sqlsrv
...
adminer support mssql
2017-05-25 04:49:07 -05:00
Shao Yu Lung
f3a016aa79
adminer support mssql
2017-05-25 16:44:51 +08:00
Yu-Lung Shao (Allen)
58995966ec
Merge pull request #972 from bestlong/put-data-in-tmp-folder-may-lost-and-no-permit
...
Change DATA_SAVE_PATH default value avoid lost data
2017-05-24 21:53:38 -05:00
Shao Yu Lung
c913c429c0
change DATA_SAVE_PATH
2017-05-25 10:04:41 +08:00
Shao Yu Lung
d4caddcaed
move default config DATA_SAVE_PATH from /tmp to ~/.laradocc/data
...
avoid lost data and windows no have /tmp folder.
2017-05-25 09:56:14 +08:00
Yu-Lung Shao (Allen)
8d7b3a84be
Merge pull request #971 from bestlong/adjustment-travis-ci
...
[Travis-CI] using set -x could produce more debug info.
2017-05-24 20:40:55 -05:00
Shao Yu Lung
fc8ffe5731
using set -x could produce more debug info.
2017-05-25 09:33:40 +08:00
avenli
9e81f92d58
fix mongodb php extension config
2017-05-24 14:47:12 +08:00