ykxiao/laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,741 Commits 1 Branch 159 Tags
20b0181b6dd8609e4dd77f123450058ac0a516e1
Commit Graph

1741 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Caule Simon
59dff53176 Don't use docker-compose down to stop containers 
This delete containers and volume too. 
Use docker-compose stop who only stop containers
 2017-11-28 15:33:27 +01:00
Caule Simon
34267ffc4d #1275 Fix memory leaks in docker-sync with verbose true 2017-11-27 12:00:05 +01:00
Ennio Simões
57918b69a7 adding '\' to the Dockerfile nginx statement 2017-11-26 17:30:32 -02:00
francoisfaubert
c11658559a Updated the documentation to illustrate my proposition 2017-11-23 14:21:38 -05:00
francoisfaubert
47c74d1334 Added clarification on how to split multiple docker-compose files within COMPOSE_FILE on Windows 2017-11-23 14:02:56 -05:00
Mahmoud Zalt
e779bf96ab reorder some keys in the .env for easier modification 2017-11-23 20:52:42 +02:00
Mahmoud Zalt
06ce5ca222 add open collective to the documentation 2017-11-23 20:41:41 +02:00
Mahmoud Zalt
c06c28aa04 Merge branch 'opencollective-opencollective' 
* opencollective-opencollective:
  add open collective to the readme
  Update README.md
 2017-11-23 20:30:27 +02:00
Mahmoud Zalt
c1e80e3af4 add open collective to the readme 2017-11-23 20:30:10 +02:00
Mahmoud Zalt
a7c9232193 Merge branch 'opencollective' of https://github.com/opencollective/laradock into opencollective-opencollective 
* 'opencollective' of https://github.com/opencollective/laradock:
  Update README.md
 2017-11-23 20:16:54 +02:00
Mahmoud Zalt
265bc13917 Merge pull request #1251 from mouyong/master 
Set environment to change source.
 2017-11-23 20:12:11 +02:00
牟勇
8d410e9c82 merge upstream 2017-11-23 13:42:33 +08:00
Aseem Sood
f56a585ab2 Update README.md 2017-11-22 17:52:45 -05:00
Mahmoud Zalt
9b8d4806a8 Merge pull request #1265 from jeff-h/master1 
Specifying included docker-compose files in the .env is more flexible
 2017-11-22 20:15:07 +02:00
Jeff
73b95357ac Specifying included docker-compose files in the .env is more flexible than hardcoding in the shell script. 2017-11-22 10:48:22 +13:00
Mahmoud Zalt
65a8bbc6a4 Merge pull request #1262 from jeff-h/issue-171 
Fixes #353 and allows easier dev & prod environments
v5.8.3 		2017-11-21 22:56:04 +02:00
Mahmoud Zalt
7c1f3060bf Merge pull request #1257 from nellonican/hotfix 
Remove python installation from Dockerfile-71
 2017-11-21 22:55:33 +02:00
Mahmoud Zalt
45e1ecf3c0 Merge pull request #1256 from ricardoseriani/remove-the-github-paragraph-on-header 
Remove the github paragraph on header
 2017-11-21 22:54:54 +02:00
Mahmoud Zalt
c6b1eb016d Merge pull request #1255 from zuohuadong/patch-23 
Remove useless...
 2017-11-21 22:53:32 +02:00
Mahmoud Zalt
c5005f54f7 Merge pull request #1254 from zuohuadong/patch-22 
add git  & Chinese users friendly.
 2017-11-21 22:53:19 +02:00
Jeff
cf5b1af31a Fixes #353 and allows easier dev & prod environments by splitting dev-specific configuration into a separate docker-compose. 2017-11-21 09:59:11 +13:00
Thorvald Falkenburg
8dea201b68 Remove python installation from Dockerfile-71 
Python can be installed by using the WORKSPACE_INSTALL_PYTHON
variable in the .env file. Fixes #1238
 2017-11-16 21:31:43 +01:00
Ricardo Seriani
50a3e24db8 Remove the github paragraph on header 
Remove the github paragraph on header, since it already has a link to github using aria to accessibility
 2017-11-16 12:13:00 -02:00
huadong zuo
9835a20863 Remove useless... 
Remove useless...
 2017-11-15 13:05:26 +08:00
huadong zuo
5bcb99dfb9 add git & Chinese users friendly. 
China can not access  golang.org.
 2017-11-15 13:00:57 +08:00
Mahmoud Zalt
9877f0453e Merge pull request #1253 from gbroques/fix-logo-covers-links-in-mobile-drawer-menu 
Fix logo covering links in mobile drawer menu (Closes #1252)
v5.8.2 		2017-11-14 22:28:49 +02:00
G Roques
ff20333d8c Fix logo covering links in mobile drawer menu (Closes #1252) 2017-11-14 09:44:58 -06:00
牟勇
a99281cda8 Change application source from dl-cdn.alpinelinux.org to aliyun source 2017-11-14 21:03:19 +08:00
牟勇
1342b696ea Merge branch 'master' of https://github.com/laradock/laradock 2017-11-14 20:57:52 +08:00
Mahmoud Zalt
2fc0f3cb2e improve readability of the .env file 2017-11-14 12:53:30 +02:00
Mahmoud Zalt
6c3b18340f Merge pull request #1248 from mariano-dagostino/fix1247 
Fixes #1247 by removing /var/log/fastlog and /var/log/lastlog
 2017-11-13 20:27:21 +02:00
Mahmoud Zalt
de247a074e Merge pull request #1246 from axit-joost/master 
Fixes laradock/laradock#1245 by adding python to the image
 2017-11-13 20:27:07 +02:00
Mahmoud Zalt
176dd74906 Merge pull request #1244 from zuohuadong/patch-21 
upgrade  Description
 2017-11-13 20:26:54 +02:00
Mahmoud Zalt
819b1eb3bc Merge pull request #1243 from zuohuadong/patch-20 
fix pgadmin-backup
 2017-11-13 20:26:33 +02:00
Mariano D'Agostino
05dd1b0339 Fixes #1247 by removing /var/log/fastlog and /var/log/lastlog 2017-11-13 13:37:04 -03:00
Joost Jacobs
f0401f5047 Fixes laradock/laradock#/1245 by adding python to the image 2017-11-13 14:39:57 +01:00
huadong zuo
be13fdba7f upgrade Description 
upgrade  Description
 2017-11-13 18:35:11 +08:00
huadong zuo
bd0f04bd80 fix pgadmin-backup 
new version has new contents
 2017-11-13 18:33:28 +08:00
Mahmoud Zalt
f7ac8cf862 Merge pull request #1241 from nellonican/master 
Fix Dockerfile
 2017-11-12 20:56:40 +02:00
Thorvald Falkenburg
b47963c80d Fix Dockerfile 
Building the workspace docker image with Dockerfile-71 failed because
of missing "&&"
 2017-11-12 19:45:44 +01:00
Mahmoud Zalt
35183eff42 Merge pull request #1240 from JeromeDesseaux/master 
solving python issue when using INSTALL_NODE=true and VueJS with Laravel.
v5.8.1 		2017-11-12 18:17:45 +02:00
Jérôme Desseaux
c5ccc2f4ff soving python issue when using INSTALL_NODE=true and VueJS with Laravel. 2017-11-12 11:04:57 +01:00
Mahmoud Zalt
34ef36cd7e doc updates 2017-11-10 14:37:01 +02:00
Mahmoud Zalt
7138d7a13c update some text in the index page 2017-11-08 09:01:40 +02:00
Mahmoud Zalt
c7695ca175 add Huadong Zuo @zuohuadong to the contributors list 2017-11-08 08:31:29 +02:00
Mahmoud Zalt
6f3c41b84d add sponsors section 2017-11-08 08:18:26 +02:00
Mahmoud Zalt
46852bc31b Merge pull request #1232 from zuohuadong/patch-17 
Update Dockerfile-71
 2017-11-08 05:24:42 +02:00
Mahmoud Zalt
5a21337cc5 Merge pull request #1231 from zuohuadong/patch-16 
Update Dockerfile-70
 2017-11-08 05:24:34 +02:00
Mahmoud Zalt
e2091cd309 Merge pull request #1234 from zuohuadong/patch-19 
fix error
 2017-11-08 05:24:08 +02:00
Mahmoud Zalt
1ead8aa060 Merge pull request #1228 from JeroenVanOort/master 
added IMAP extension to workspace
 2017-11-08 05:19:08 +02:00