kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity
19322 commits 10 branches 356 tags 299 MiB
Commit graph

19322 commits

Author SHA1 Message Date
Hugo Marisco
7f7953dcc2 update gpg add key command, without sudo it fails 
Signed-off-by: Hugo Marisco <0x6875676f@gmail.com>
 2015-10-27 13:49:52 +00:00
Brian Goff
ebf8ca9a67 Merge pull request from sdurrheimer/zsh-completion-fix-missing-double-quote 
Fix missing double quote in zsh completion
 2015-10-27 09:19:59 -04:00
Steve Durrheimer
e46445e844 Fix missing double quote in zsh completion 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-10-27 10:50:45 +01:00
Tibor Vass
b72a431928 Merge pull request from tonistiigi/15995-duplicate-names 
Fix duplicate container names conflict
 2015-10-27 02:42:50 -04:00
Sebastiaan van Stijn
b92fd9ff04 Merge pull request from vincentbernat/fix/zsh-option-stacking 
zsh: enable option stacking
 2015-10-27 01:39:04 +01:00
David Calavera
91de5ddf18 Merge pull request from mavenugo/rc3v1 
Vendoring in libnetwork with fixes for issues identified in RC1 & RC2
 2015-10-26 17:06:01 -07:00
Tonis Tiigi
aee5486374 Fix duplicate container names conflict 
While creating multiple containers the second 
container could remove the first one from graph
and not produce an error.

Fixes 

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2015-10-26 16:57:50 -07:00
David Calavera
fe1e04a84f Merge pull request from Microsoft/10662-exectp4workaround 
Windows [TP4] Trap Hyper-V exec failure
 2015-10-26 16:47:51 -07:00
David Calavera
4cbe227db8 Merge pull request from Microsoft/10662-unmountwithsyscall 
Windows: Volumes PR rename UnmountWithSyscall
 2015-10-26 16:15:00 -07:00
Tibor Vass
3f11360a54 Merge pull request from mavenugo/42def 
Simple Info log to indicate the chosen IP Address for the default bridge
 2015-10-26 19:11:56 -04:00
Vincent Demeester
bffcb8226e Merge pull request from LK4D4/remove_host_integration 
Remove contrib/host-integration
 2015-10-26 23:45:20 +01:00
Vincent Demeester
f3f63c6044 Merge pull request from echo33/docker_cli_exec_test 
use of checkers on docker_cli_exec_test.go
 2015-10-26 23:14:38 +01:00
Vincent Demeester
0d963de867 Merge pull request from coolljt0725/fix_redundat_log 
Better daemon log on docker load
 2015-10-26 23:09:00 +01:00
Alexander Morozov
0bd7aedc36 Merge pull request from Microsoft/10662-refactorresources 
Windows: Refactor resources structure
 2015-10-26 15:01:17 -07:00
Vincent Demeester
962243e387 Merge pull request from liaoqingwei/16756-docker_cli_config_test 
Use of checkers on docker_cli_config_test.go
 2015-10-26 23:00:04 +01:00
Madhu Venugopal
126d1b6ca1 Simple log to indicate the chosen IP Address for the default bridge 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-26 14:46:08 -07:00
Sebastiaan van Stijn
9312a738d8 Merge pull request from jfrazelle/apparmor-check-version-on-deb-install 
apparmor check version on deb install
 2015-10-26 22:44:11 +01:00
Vincent Bernat
402caa94d2 zsh: allow option stacking for short options without arguments 
This enables Zsh to understand commands like "docker run -it
ubuntu". However, by enabling this, this also makes Zsh completes
"docker run -u<tab>" with "docker run -uapprox" which is not valid. The
users have to put the space or the equal sign themselves before trying
to complete.

Therefore, this behavior is disabled by default. To enable it:

    zstyle ':completion:*:*:docker:*' option-stacking yes
    zstyle ':completion:*:*:docker-*:*' option-stacking yes

Signed-off-by: Vincent Bernat <vincent@bernat.im>
 2015-10-26 21:58:59 +01:00
Vincent Bernat
8ac32d900a zsh: allow short options to specify their arguments with "=" 
This is allowed by Docker and helps the completion to not get confused
when a user uses this notation. This will also help to enable stacking
of short options since Zsh needs that to not stack options with
arguments.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
 2015-10-26 21:58:59 +01:00
Madhu Venugopal
139d1e13e2 Vendoring in libnetwork with fixes for issues identified in RC1 & RC2 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-26 13:56:56 -07:00
John Howard
b1220a763c Windows: Refactor resources structure 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-26 13:48:16 -07:00
David Calavera
2dd822f322 Merge pull request from liaoqingwei/16756-docker_cli_import_test 
Use of checkers on docker_cli_import_test.go
 2015-10-26 13:42:02 -07:00
David Calavera
e252fe288c Merge pull request from cpuguy83/dump_http_request_on_debug 
Dump request when daemon is set to debug
 2015-10-26 13:41:14 -07:00
John Howard
853f2e9952 Windows: Volumes PR fix one of Tibors nits 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-26 13:34:49 -07:00
Michael Crosby
8173acca95 Merge pull request from brahmaroutu/fix_gccgo_ci 
GCCGO requires more memory and time to start containers, fixing GCCGO…
 2015-10-26 13:33:59 -07:00
Michael Crosby
5cf028d3dd Merge pull request from calavera/version_exec_json_check 
Version exec json check.
 2015-10-26 13:32:32 -07:00
David Calavera
c52fdce2f2 Merge pull request from FeroVolar/namegenerator 
Add Heyrovsky
 2015-10-26 13:26:43 -07:00
David Calavera
1b9d064b73 Merge pull request from LK4D4/fix_dumper 
Fix dumper program to use proper import
 2015-10-26 13:25:36 -07:00
Michael Crosby
74a881c9e4 Merge pull request from HuKeping/update-test 
Update docker_cli_build_unix_test
 2015-10-26 13:21:31 -07:00
Alexander Morozov
0dec8091a2 Remove contrib/host-integration 
It's outdated and unused.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-10-26 13:18:50 -07:00
Alexander Morozov
1477a3d7fd Fix dumper program to use proper import 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-10-26 13:10:01 -07:00
Brian Goff
5087e8c2e8 Merge pull request from rhatdan/destroy 
Docker is calling cont.Destroy twice on success
 2015-10-26 15:48:04 -04:00
Brian Goff
b21f95c612 Merge pull request from fgimenez/16756-refactor-docker_cli_external_graphdriver_unix_test-to-use-checker 
Use checker assert for docker_cli_external_graphdriver_unix_test.go
 2015-10-26 15:39:08 -04:00
David Calavera
0b5e628e14 Version exec json check. 
Keep backwards compatibility with old versions of the api.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-10-26 15:12:06 -04:00
Srini Brahmaroutu
2046ba3e3c GCCGO requires more memory and time to start containers, fixing GCCGO x86 CI 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-10-26 19:09:00 +00:00
Sebastiaan van Stijn
74b9d89648 Merge pull request from sdurrheimer/zsh-completion-build-multi-tag 
Add zsh completion for 'docker build' multi tags
 2015-10-26 19:05:23 +01:00
Alexander Morozov
34439f3ecb Merge pull request from mavenugo/predefined 
Prevent user from deleting pre-defined networks
 2015-10-26 10:06:45 -07:00
Tibor Vass
7e275cf0e5 Merge pull request from sdurrheimer/zsh-completion-fix-repeatable-options 
Fix repeatable options in zsh completion
 2015-10-26 12:43:21 -04:00
Hu Keping
f410d7e70f Update docker_cli_build_unix_test 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-10-26 21:06:11 +08:00
Antonio Murdaca
9328fc7e62 Merge pull request from maaquib/16756-integration-cli-export-import-test 
Using checkers assert for integration-cli/docker_cli_export_import_test.go
 2015-10-26 13:58:21 +01:00
Federico Gimenez
7058ec278d Use checker assert for integration-cli/docker_cli_external_graphdriver_unix_test.go 
Signed-off-by: Federico Gimenez <fgimenez@coit.es>
 2015-10-26 09:09:38 +01:00
liaoqingwei
d1ed5f62ad Use of checkers on docker_cli_config_test.go. 
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
 2015-10-26 10:51:12 +08:00
weiyan
9120a1fc3e use of checkers on docker_cli_exec_test.go 
Signed-off-by: weiyan <weiyan3@huawei.com>
 2015-10-26 10:01:48 +08:00
Brian Goff
75128c46c7 Merge pull request from maaquib/16756-integration-cli-unix-events-test 
Using checkers assert for integration-cli/docker_cli_events_unix_test.go
 2015-10-25 20:39:32 -04:00
Madhu Venugopal
ead62b5952 Prevent user from deleting pre-defined networks 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-25 17:17:29 -07:00
Vincent Demeester
c71e97fc12 Merge pull request from askb/17225_flakytest_TestExecEnv 
Fix for the issue  flaky test DockerSuite.TestExecEnv test case.
 2015-10-25 21:17:50 +01:00
Doug Davis
029e7ae4e0 Merge pull request from askb/17243_flaykytest_TestExecAfterContainerRestart 
Fix for  DockerSuite.TestExecAfterContainerRestart.
 2015-10-25 13:25:21 -04:00
Anil Belur
2a5f04dcc9 Fix for DockerSuite.TestExecAfterContainerRestart. 
Added waitRun(containerID) statement after docker run -d and docker restart
to ensure the container is restarted before issuing a exec cmd.

Signed-off-by: Anil Belur <askb23@gmail.com>
 2015-10-25 21:43:31 +05:30
Sebastiaan van Stijn
5bcd6aba4b Merge pull request from moxiegirl/docs-readme-update 
Tweaking some things
 2015-10-25 16:45:04 +01:00
Tibor Vass
271f85afac Merge pull request from aboch/d0 
Disable built-in SD on default bridge network
 2015-10-25 11:04:27 -04:00