Commit Graph

1457 Commits

Author SHA1 Message Date
c6a8500c44 fix install hhvm package cannot be authenticated 2017-12-10 17:43:30 +08:00
b981168111 Merge pull request #1305 from bestlong/fix-workspace-php-56-build-fail
Fix workspace php56 build fail
2017-12-10 17:33:15 +08:00
cd1c9c0d44 fix aerospike build fail 2017-12-10 16:13:39 +08:00
8e32b93264 Merge pull request #1304 from bestlong/fix-php-fpm-56-aerospike-build-fail
fix aerospike build fail
2017-12-10 09:00:16 +01:00
a2ae141a75 fix aerospike build fail 2017-12-10 15:10:41 +08:00
f22ceb71ab Merge pull request #1298 from nm777/bug/issue-1296-php56-ldap-in-workspace
Add LDAP support to PHP 5.6 workspace
2017-12-06 21:36:32 +01:00
6ea86fbce3 Add LDAP support to PHP 5.6 workspace
Issue #1296:
PHP 7.0 and 7.1 workspaces support adding the PHP LDAP module. The
PHP 5.6 workspace file seems to have missed this for some reason.
2017-12-05 12:52:35 -06:00
dec08ec2b1 Merge pull request #1295 from Rhymond/patch-2
LInk is not working
2017-12-05 02:31:28 +01:00
98fba83331 LInk is not working 2017-12-04 09:38:57 +00:00
694b39ddf4 Merge pull request #1293 from Rhymond/patch-1
Compatibility for COMPOSE_FILE
v5.8.4
2017-12-04 08:51:32 +01:00
d0167475ba Merge pull request #1279 from scaule/scaule-patch
Don't use docker-compose down to stop containers
2017-12-04 08:38:29 +01:00
3bdab382ea Merge pull request #1276 from scaule/patch-#1275
#1275 Fix memory leaks in docker-sync with verbose true
2017-12-04 08:36:37 +01:00
80f6e8b60c Merge pull request #1273 from EnnioSimoes/master
adding '\' to the Dockerfile nginx statement
2017-12-04 08:36:03 +01:00
ba61566f28 Merge pull request #1269 from francoisfaubert/master
Clarified how to split multiple docker-compose files on Windows
2017-12-04 08:35:01 +01:00
9ae10d32ce Merge pull request #1233 from zuohuadong/patch-18
Remove duplicate configuration
2017-12-04 08:34:17 +01:00
cf136f891b Windows compatibility
COMPOSE_PATH_SEPARATOR
If set, the value of the COMPOSE_FILE environment variable will be separated using this character as path separator.
2017-12-03 23:04:20 +00:00
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
34267ffc4d #1275 Fix memory leaks in docker-sync with verbose true 2017-11-27 12:00:05 +01:00
57918b69a7 adding '\' to the Dockerfile nginx statement 2017-11-26 17:30:32 -02:00
c11658559a Updated the documentation to illustrate my proposition 2017-11-23 14:21:38 -05:00
47c74d1334 Added clarification on how to split multiple docker-compose files within COMPOSE_FILE on Windows 2017-11-23 14:02:56 -05:00
e779bf96ab reorder some keys in the .env for easier modification 2017-11-23 20:52:42 +02:00
06ce5ca222 add open collective to the documentation 2017-11-23 20:41:41 +02:00
c06c28aa04 Merge branch 'opencollective-opencollective'
* opencollective-opencollective:
  add open collective to the readme
  Update README.md
2017-11-23 20:30:27 +02:00
c1e80e3af4 add open collective to the readme 2017-11-23 20:30:10 +02:00
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
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
f56a585ab2 Update README.md 2017-11-22 17:52:45 -05:00
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
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
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
7c1f3060bf Merge pull request #1257 from nellonican/hotfix
Remove python installation from Dockerfile-71
2017-11-21 22:55:33 +02:00
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
c6b1eb016d Merge pull request #1255 from zuohuadong/patch-23
Remove useless...
2017-11-21 22:53:32 +02:00
c5005f54f7 Merge pull request #1254 from zuohuadong/patch-22
add git  & Chinese users friendly.
2017-11-21 22:53:19 +02:00
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
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
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
9835a20863 Remove useless...
Remove useless...
2017-11-15 13:05:26 +08:00
5bcb99dfb9 add git & Chinese users friendly.
China can not access  golang.org.
2017-11-15 13:00:57 +08:00
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
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
2fc0f3cb2e improve readability of the .env file 2017-11-14 12:53:30 +02:00
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
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
176dd74906 Merge pull request #1244 from zuohuadong/patch-21
upgrade  Description
2017-11-13 20:26:54 +02:00
819b1eb3bc Merge pull request #1243 from zuohuadong/patch-20
fix pgadmin-backup
2017-11-13 20:26:33 +02:00