dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-09 09:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,481 Commits 19 Branches 592 Tags
7bf776f1c3b114e4e7528b2ff79c74e8d286fd23
Commit Graph

21481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Goff
7bf776f1c3 Merge pull request #19482 from LK4D4/up_osx_sdk 
Move long compilations before Go install in Dockerfile
 2016-01-20 20:11:32 -05:00
Lei Jitang
bb8d8a645a Merge pull request #19430 from keloyang/StatsNoStreamGetCpu 
remove the check of ContentLength in TestApiStatsNoStreamGetCpu
 2016-01-21 09:07:00 +08:00
David Calavera
ee001d87a9 Merge pull request #19514 from cpuguy83/19444_fix_links_with_same_name 
Don't error out when link name in use.
 2016-01-20 15:21:58 -08:00
Alexander Morozov
4a9523adc9 Merge pull request #19513 from crosbymichael/tty-restore 
Move tty set and restore to caller
 2016-01-20 15:05:14 -08:00
Sebastiaan van Stijn
ad87333f79 Merge pull request #19452 from mortonfox/patch-1 
cgroups documentation moved
 2016-01-20 14:54:24 -08:00
David Calavera
7915077a38 Merge pull request #19485 from HackToday/fixlink 
Fix the ulimit link
 2016-01-20 14:53:38 -08:00
Sebastiaan van Stijn
048234fcdb Merge pull request #19487 from HackToday/fixcommitcli 
Fix commit wrong repository example
 2016-01-20 14:45:59 -08:00
Sebastiaan van Stijn
c21eb2a420 Merge pull request #19501 from vdemeester/remove-validate-vendor-from-default-bundles 
Remove validate-vendor from default bundles
 2016-01-20 14:29:07 -08:00
Brian Goff
332d95fd0d Don't error out when link name in use. 
This preserves old behavior from sqlite links/names.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-01-20 16:40:56 -05:00
Michael Crosby
a1eb6029cc Move tty set and restore to caller 
Fixes #19506

This fixes the issue of errors on create and the tty not being able to
be restored to its previous state because of a race where it was
in the hijack goroutine.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-01-20 13:32:19 -08:00
Alexander Morozov
7bddbdf360 Merge pull request #19503 from jfrazelle/update-logrus 
bump logrus
 2016-01-20 12:54:49 -08:00
Tibor Vass
2705fa573b Merge pull request #19457 from calavera/post_config_verification 
Fix post config verification without flags.
 2016-01-20 14:49:32 -05:00
David Calavera
bcf155bb7a Merge pull request #19469 from crosbymichael/libcontainer-resource-hf 
Update libcontainer to 47e3f834d73e76bc2a6a585b48d
 2016-01-20 11:31:14 -08:00
Vincent Demeester
a866e7e2ee Merge pull request #19496 from dbarboza/19495-doc-grammar 
Fix minor doc grammar issues
 2016-01-20 20:26:15 +01:00
David Calavera
cd3446972e Fix post config verification without flags. 
- Set the daemon log level to what's set in the configuration.
- Enable TLS when TLSVerify is enabled.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-20 13:01:07 -05:00
David Calavera
fd79462af3 Merge pull request #19044 from HackToday/18890-validate-volume 
Fix volume filter validation
 2016-01-20 09:56:30 -08:00
Jessica Frazelle
95695aa38c bump logrus 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-01-20 09:51:09 -08:00
Vincent Demeester
e5bce74592 Remove validate-vendor from default bundles 
Because it's triggered another way :)
See https://github.com/docker/leeroy/pull/44

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-01-20 18:29:28 +01:00
Sebastiaan van Stijn
b433e1e7fb Merge pull request #19486 from sdurrheimer/zsh-completion-network-links 
Zsh completion for '--alias --net-alias --ip --ip6 --link'
 2016-01-20 09:28:04 -08:00
Dave Barboza
f50d0d7fdb Fix minor doc grammar issues 
Signed-off-by: Dave Barboza <dxbarboza@gmail.com>
 2016-01-20 10:52:21 -05:00
Doug Davis
bdcc3ebe41 Merge pull request #19447 from sillyousu/19407-fix-exec-store-data-race 
Fix race condition in execCommandGC
 2016-01-20 07:46:28 -05:00
Vincent Demeester
7646bed1ad Merge pull request #19479 from ywy1ywy/my-branch 
fix a spelling error of 'dnsmasq'
 2016-01-20 13:33:26 +01:00
Antonio Murdaca
e9ac149472 Merge pull request #19478 from zchee/add-arg-syntax 
Add `ARG` instruction syntax for vim
 2016-01-20 13:20:47 +01:00
Vincent Demeester
2ba549407a Merge pull request #19467 from sdurrheimer/zsh-completion-detach-keys 
Add zsh completion for 'docker {attach,exec,run,start} --detach-keys'
 2016-01-20 11:54:13 +01:00
Kai Qiang Wu(Kennan)
3c8042a0cb Fix commit wrong repository example 
The old name is invalid in new repository name spec.
So we need to fix them.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-01-20 10:25:41 +00:00
Steve Durrheimer
fe8a6a5b67 Add zsh completion for 'docker network connect --link' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-01-20 10:19:03 +01:00
Steve Durrheimer
5284e037ff Add zsh completion for 'docker {network connect, create, run} --ip --ip6' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-01-20 10:19:03 +01:00
Steve Durrheimer
898b53fafa Add zsh completion for 'docker network connect --alias' and 'docker {create, run} --net-alias' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-01-20 10:19:03 +01:00
Kai Qiang Wu(Kennan)
8f3c0fdff3 Fix the ulimit link 
The old link not existed, we need fix it the right one.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-01-20 09:18:20 +00:00
Steve Durrheimer
32bd703926 Add zsh completion for 'docker {attach,exec,run,start} --detach-keys' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-01-20 10:14:35 +01:00
Sebastiaan van Stijn
d45643a865 Merge pull request #19459 from sdurrheimer/zsh-completion-network-create-ipam-opt 
Add zsh completion for 'docker network create --ipam-opt'
 2016-01-20 00:30:30 -08:00
Vincent Demeester
87b7ff5267 Merge pull request #19465 from mavenugo/sysd 
Vendor libnetwork v0.6.0-rc1
 2016-01-20 09:02:21 +01:00
Alexander Morozov
c38cba3b8c Move long compilations before Go install in Dockerfile 
Now we can avoid long compilations on Go update.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-01-19 22:43:42 -08:00
Wenyu You
5e450bc5df fix a spelling error of 'dnsmasq' 
Signed-off-by: Wenyu You <21551128@zju.edu.cn>
 2016-01-20 06:12:22 +00:00
Koichi Shiraishi
b15247868c Add ARG instruction syntax for vim 
Signed-off-by: Koichi Shiraishi <k@zchee.io>
 2016-01-20 15:08:45 +09:00
Sebastiaan van Stijn
cd1ed858d3 Merge pull request #19471 from thaJeztah/fix-19393-increase-timeout 
Fix DockerTrustSuite SetUpTest
 2016-01-19 21:58:24 -08:00
Pei Su
e5e62b96ce Fix race condition in execCommandGC 
`daemon.execCommandGC`
The daemon object (grep execCommandGC) iterate over a map
(grep execCommands.Commands) in a goroutine.
Lock can't protect concurrency access in this case.
Exec command storage object should return a copy of commands instead.

Signed-off-by: Pei Su <sillyousu@gmail.com>
 2016-01-20 12:52:05 +08:00
Tibor Vass
7657e233f7 Merge pull request #19466 from aaronlehmann/vendor-distribution 
Vendor updated docker/distribution package
 2016-01-19 21:05:43 -05:00
Sebastiaan van Stijn
910a5fc234 Fix DockerTrustSuite SetUpTest 
This hopefully makes DockerTrustSuite.SetUpTest
less flaky.

Increased the number of attempts to check
if Notary is available before giving up.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-01-19 16:45:47 -08:00
Michael Crosby
5f73ab8952 Update libcontainer to 47e3f834d73e76bc2a6a585b48d 
This adds a fix for the resource struct in the cgroups type and seccomp
IsEnabled function

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-01-19 15:34:08 -08:00
Sebastiaan van Stijn
e11a7f5371 Merge pull request #19458 from dmcgowan/layerstore-error-handling 
Add more robust error handling on layer store creation
 2016-01-19 14:37:23 -08:00
Jess Frazelle
389784abe1 Merge pull request #19462 from tophj-ibm/fix-arm-integration-cli-requirement 
Fix test requirement for ARM
 2016-01-19 14:24:28 -08:00
Madhu Venugopal
8799218d01 IT for remote network driver & ungraceful restart 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-19 14:09:11 -08:00
Madhu Venugopal
ee3b42f385 Vendor libnetwork v0.6.0-rc1 
- Fixes docker/docker#19404
- Fixes ungraceful daemon restart issue in systemd with remote
  network plugin (https://github.com/docker/libnetwork/issues/813)

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-19 13:50:17 -08:00
Aaron Lehmann
588e27f9a5 Vendor updated docker/distribution package 
Fixes #19400

Note that this introduces an incompatibility with Docker 1.10-rc1,
because the media type used for schema1 manifests has been corrected in
the upstream distribution code. Docker 1.10-rc1 won't be able to pull
old manifests from Registry 2.3-rc0 and up, but because of this vendor
update, Docker 1.10-rc2 won't have this problem.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-01-19 13:28:51 -08:00
Doug Davis
c18b4943ea Merge pull request #19460 from LK4D4/remove_comment 
Remove obsolete comment
 2016-01-19 15:29:46 -05:00
Christopher Jones
d12f4babdd Fix test requirement for ARM 
Correctly passes the DOCKER_ENGINE_GOARCH env var
to the testing environment

Also fixes logic for skipping a test if on ARM.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2016-01-19 15:23:46 -05:00
Alexander Morozov
3dc8829a83 Remove obsolete comment 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-01-19 12:17:40 -08:00
Steve Durrheimer
da26fc26b2 Add zsh completion for 'docker network create --ipam-opt' + Reordering for better maintainability 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-01-19 21:16:16 +01:00
Sebastiaan van Stijn
4b63689679 Merge pull request #19385 from runcom/better-git-error 
api: client: build: do not fall through if git isn't installed
 2016-01-19 11:39:05 -08:00