p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,488 Commits 2 Branches 295 Tags
bc39a3fed64c083ed99445f9b9c19f978573cd4f
Commit Graph

21488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jess Frazelle
bc39a3fed6 Merge pull request #19377 from jfrazelle/cleanup-build-rpm-deb 
Cleanup build rpm deb
Upstream-commit: 5537a92e450ea56e2002f83ff50bb70fdb2cc25e
Component: engine
 2016-01-20 23:58:33 -08:00
Sebastiaan van Stijn
8e2b976298 Merge pull request #19434 from HackToday/fixmntvolume 
Refine the volume mount example
Upstream-commit: 7db58948bf256ae7daf372eed6b996688e4aae40
Component: engine
 2016-01-20 20:42:24 -08:00
Sebastiaan van Stijn
9a21c2f764 Merge pull request #19530 from HackToday/fixtiny 
Fix the typo in ps
Upstream-commit: 13dbf52611899060878764427314628296316c3d
Component: engine
 2016-01-20 20:41:35 -08:00
Kai Qiang Wu(Kennan)
c9d0008e68 Fix the typo in ps 
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: c2b59b03df364901ce51ee485d60fce7e7aaa955
Component: engine
 2016-01-21 04:26:49 +00:00
Brian Goff
0a2632d57e Merge pull request #19482 from LK4D4/up_osx_sdk 
Move long compilations before Go install in Dockerfile
Upstream-commit: 7bf776f1c3b114e4e7528b2ff79c74e8d286fd23
Component: engine
 2016-01-20 20:11:32 -05:00
Lei Jitang
1f1d0b2d28 Merge pull request #19430 from keloyang/StatsNoStreamGetCpu 
remove the check of ContentLength in TestApiStatsNoStreamGetCpu
Upstream-commit: bb8d8a645a45b5694b5f450535dc8364213fab88
Component: engine
 2016-01-21 09:07:00 +08:00
David Calavera
91470191b7 Merge pull request #19514 from cpuguy83/19444_fix_links_with_same_name 
Don't error out when link name in use.
Upstream-commit: ee001d87a93a7da106fc052172cc3959ee457939
Component: engine
 2016-01-20 15:21:58 -08:00
Alexander Morozov
077cda22f8 Merge pull request #19513 from crosbymichael/tty-restore 
Move tty set and restore to caller
Upstream-commit: 4a9523adc90de8fea1de23b5e33ae184bdd9f25e
Component: engine
 2016-01-20 15:05:14 -08:00
Sebastiaan van Stijn
496ec096f7 Merge pull request #19452 from mortonfox/patch-1 
cgroups documentation moved
Upstream-commit: ad87333f7968fe8c219288ac8bcb2e0f61c618cb
Component: engine
 2016-01-20 14:54:24 -08:00
David Calavera
4b5b18fd7e Merge pull request #19485 from HackToday/fixlink 
Fix the ulimit link
Upstream-commit: 7915077a38e30496391a0759f08134b8942f8524
Component: engine
 2016-01-20 14:53:38 -08:00
Sebastiaan van Stijn
f4fc2afe32 Merge pull request #19487 from HackToday/fixcommitcli 
Fix commit wrong repository example
Upstream-commit: 048234fcdbc4f3af7e81048bbd2367940f3718ac
Component: engine
 2016-01-20 14:45:59 -08:00
Sebastiaan van Stijn
52842fc3ba Merge pull request #19501 from vdemeester/remove-validate-vendor-from-default-bundles 
Remove validate-vendor from default bundles
Upstream-commit: c21eb2a4209f6339fe59e4a97c3e6479aeb39f94
Component: engine
 2016-01-20 14:29:07 -08:00
Brian Goff
677299f50c 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>
Upstream-commit: 332d95fd0dd08c352f96e8755414e40007f6bda2
Component: engine
 2016-01-20 16:40:56 -05:00
Michael Crosby
31eb5171fa 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>
Upstream-commit: a1eb6029cc4e4ccd820b0aac147a6121f1967ba2
Component: engine
 2016-01-20 13:32:19 -08:00
Alexander Morozov
88d33e25a1 Merge pull request #19503 from jfrazelle/update-logrus 
bump logrus
Upstream-commit: 7bddbdf360f50fed07cd21b21270f5f287222d8c
Component: engine
 2016-01-20 12:54:49 -08:00
Tibor Vass
f35e915163 Merge pull request #19457 from calavera/post_config_verification 
Fix post config verification without flags.
Upstream-commit: 2705fa573b10890b39295781b41dca6d69013e6b
Component: engine
 2016-01-20 14:49:32 -05:00
David Calavera
aaa9f64061 Merge pull request #19469 from crosbymichael/libcontainer-resource-hf 
Update libcontainer to 47e3f834d73e76bc2a6a585b48d
Upstream-commit: bcf155bb7a3cacf8f37e98d41c136eeba3f7775e
Component: engine
 2016-01-20 11:31:14 -08:00
Vincent Demeester
22bda58d7b Merge pull request #19496 from dbarboza/19495-doc-grammar 
Fix minor doc grammar issues
Upstream-commit: a866e7e2ee39b3008c24ae1a709afa13b17de6b8
Component: engine
 2016-01-20 20:26:15 +01:00
David Calavera
55307d5648 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>
Upstream-commit: cd3446972e968639684f2b65bfc11c099a25f1b0
Component: engine
 2016-01-20 13:01:07 -05:00
David Calavera
0a1bfb4731 Merge pull request #19044 from HackToday/18890-validate-volume 
Fix volume filter validation
Upstream-commit: fd79462af3ebd5988a948f150bfbdcd2b04ca418
Component: engine
 2016-01-20 09:56:30 -08:00
Jessica Frazelle
d7e4961a40 bump logrus 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 95695aa38caafa6f4cf42f90c2e0fa67c5e36b91
Component: engine
 2016-01-20 09:51:09 -08:00
Vincent Demeester
c61a40877b 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>
Upstream-commit: e5bce745925384501422ed61cb69b968187bda0e
Component: engine
 2016-01-20 18:29:28 +01:00
Sebastiaan van Stijn
ae923d4789 Merge pull request #19486 from sdurrheimer/zsh-completion-network-links 
Zsh completion for '--alias --net-alias --ip --ip6 --link'
Upstream-commit: b433e1e7fb84608147825e5669146fd58dbbd07b
Component: engine
 2016-01-20 09:28:04 -08:00
Dave Barboza
d3c651df14 Fix minor doc grammar issues 
Signed-off-by: Dave Barboza <dxbarboza@gmail.com>
Upstream-commit: f50d0d7fdb11ce36715adfbf857e4668c0fd8f75
Component: engine
 2016-01-20 10:52:21 -05:00
Doug Davis
b1638f6733 Merge pull request #19447 from sillyousu/19407-fix-exec-store-data-race 
Fix race condition in execCommandGC
Upstream-commit: bdcc3ebe4168a72a0f12d171e674905f2fb40d01
Component: engine
 2016-01-20 07:46:28 -05:00
Vincent Demeester
9f2615b7d3 Merge pull request #19479 from ywy1ywy/my-branch 
fix a spelling error of 'dnsmasq'
Upstream-commit: 7646bed1adeb9d0b552344647fca2b619d070097
Component: engine
 2016-01-20 13:33:26 +01:00
Antonio Murdaca
1e8b478cf3 Merge pull request #19478 from zchee/add-arg-syntax 
Add `ARG` instruction syntax for vim
Upstream-commit: e9ac149472df13f1746d279263b88cb4be9eac94
Component: engine
 2016-01-20 13:20:47 +01:00
Vincent Demeester
074b0aacd3 Merge pull request #19467 from sdurrheimer/zsh-completion-detach-keys 
Add zsh completion for 'docker {attach,exec,run,start} --detach-keys'
Upstream-commit: 2ba549407a6ef690b403ad937594386889257bd9
Component: engine
 2016-01-20 11:54:13 +01:00
Kai Qiang Wu(Kennan)
45878e7bdb 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>
Upstream-commit: 3c8042a0cb2253be37303e6d646e96d87cefe0fc
Component: engine
 2016-01-20 10:25:41 +00:00
Steve Durrheimer
30908002a5 Add zsh completion for 'docker network connect --link' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: fe8a6a5b679ee75587036c823890b4a39c9db031
Component: engine
 2016-01-20 10:19:03 +01:00
Steve Durrheimer
7dd65e8f4c Add zsh completion for 'docker {network connect, create, run} --ip --ip6' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 5284e037ffd301ee9ed6a23cd130f62787a93f86
Component: engine
 2016-01-20 10:19:03 +01:00
Steve Durrheimer
faf363c01b Add zsh completion for 'docker network connect --alias' and 'docker {create, run} --net-alias' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 898b53fafab4859189e68d1e67780e5c4f1fdb29
Component: engine
 2016-01-20 10:19:03 +01:00
Kai Qiang Wu(Kennan)
c168cad9b2 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>
Upstream-commit: 8f3c0fdff3846c5d7999c200c69c9d67751acc08
Component: engine
 2016-01-20 09:18:20 +00:00
Steve Durrheimer
ebacc2ad6e Add zsh completion for 'docker {attach,exec,run,start} --detach-keys' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 32bd703926035c8c8b68be00f65d77eb752f6275
Component: engine
 2016-01-20 10:14:35 +01:00
Sebastiaan van Stijn
6035ebdc94 Merge pull request #19459 from sdurrheimer/zsh-completion-network-create-ipam-opt 
Add zsh completion for 'docker network create --ipam-opt'
Upstream-commit: d45643a8650f4c718c61fbf7ecebc8aabeb9d4d1
Component: engine
 2016-01-20 00:30:30 -08:00
Vincent Demeester
2bc66fc26e Merge pull request #19465 from mavenugo/sysd 
Vendor libnetwork v0.6.0-rc1
Upstream-commit: 87b7ff52675119aa0ddfdfa789ad5fbf9fdd99b0
Component: engine
 2016-01-20 09:02:21 +01:00
Alexander Morozov
4e4ba6f308 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>
Upstream-commit: c38cba3b8c769d39a1e42e0b79fa2eeb77fd6f04
Component: engine
 2016-01-19 22:43:42 -08:00
Kai Qiang Wu(Kennan)
62fe2c147e Refine the volume mount example 
The path here should be absolute, else it would
deem it as volume name.

Also link to release page to contain static binary,
the old link not work, because it is just used to
install docker in os distro, it can not be used
as static binary directly.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 9e3c1f260989f8302b29d45fef1a947e6072709c
Component: engine
 2016-01-20 06:40:46 +00:00
Wenyu You
c2e0bcab00 fix a spelling error of 'dnsmasq' 
Signed-off-by: Wenyu You <21551128@zju.edu.cn>
Upstream-commit: 5e450bc5df9b59ea5b1fcee2b12b30669fb8ceff
Component: engine
 2016-01-20 06:12:22 +00:00
Koichi Shiraishi
64c61da51a Add ARG instruction syntax for vim 
Signed-off-by: Koichi Shiraishi <k@zchee.io>
Upstream-commit: b15247868cf736eedb28234875508d9160a1052f
Component: engine
 2016-01-20 15:08:45 +09:00
Sebastiaan van Stijn
bea0f479a8 Merge pull request #19471 from thaJeztah/fix-19393-increase-timeout 
Fix DockerTrustSuite SetUpTest
Upstream-commit: cd1ed858d38af2dede529d9fade88069439fdade
Component: engine
 2016-01-19 21:58:24 -08:00
Pei Su
818faba77e 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>
Upstream-commit: e5e62b96ce0d4eb3934a386b07203830f55e07ce
Component: engine
 2016-01-20 12:52:05 +08:00
Tibor Vass
af3be96a25 Merge pull request #19466 from aaronlehmann/vendor-distribution 
Vendor updated docker/distribution package
Upstream-commit: 7657e233f7dae10d8bacbd76460a1e4ca84a7ac7
Component: engine
 2016-01-19 21:05:43 -05:00
Jessica Frazelle
2a3e0a22a4 add a way to only build requested pkgs 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 0bff2515f74fc6f0be9f019cc8b0f08b50e36228
Component: engine
 2016-01-19 17:47:27 -08:00
Sebastiaan van Stijn
dd61cb6f47 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>
Upstream-commit: 910a5fc2348b934dcb126c021721305d5316c7c0
Component: engine
 2016-01-19 16:45:47 -08:00
Michael Crosby
7331395789 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>
Upstream-commit: 5f73ab89523d240c61d8e745bc106232891b46f7
Component: engine
 2016-01-19 15:34:08 -08:00
Sebastiaan van Stijn
617e630788 Merge pull request #19458 from dmcgowan/layerstore-error-handling 
Add more robust error handling on layer store creation
Upstream-commit: e11a7f53719cade69ef8553a71d2d6f025acde98
Component: engine
 2016-01-19 14:37:23 -08:00
Jess Frazelle
de82678777 Merge pull request #19462 from tophj-ibm/fix-arm-integration-cli-requirement 
Fix test requirement for ARM
Upstream-commit: 389784abe1f82a385f363acc328e2ecdbdcc6eb3
Component: engine
 2016-01-19 14:24:28 -08:00
Madhu Venugopal
8e77159989 IT for remote network driver & ungraceful restart 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 8799218d01785aa056c2f1f06f3735c3e93496b4
Component: engine
 2016-01-19 14:09:11 -08:00
Madhu Venugopal
795bea682d 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>
Upstream-commit: ee3b42f385cdb41b2996b4b64f4f319adb62ad03
Component: engine
 2016-01-19 13:50:17 -08:00