docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-23 15:21:32 +03:00
Code Activity
15,543 Commits 12 Branches 297 Tags
dbb89bcdab22b85b9ba9caa3d0d56493148e01d0
Commit Graph

14427 Commits

Author SHA1 Message Date
David Calavera
dbb89bcdab Remote plugins plumbing. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 839d64ffb157ba170fb644a42f5096f334b7cc48
Component: engine
 2015-05-15 11:04:58 -07:00
Alexander Morozov
8de199cc5a Merge pull request #13087 from duglin/FixNatTest 
Fix random errors in DockerSuite.TestNetworkNat
Upstream-commit: fe6f77df2ca6c6ee463b5eba88b428ed8b99281b
Component: engine
 2015-05-14 08:35:27 -07:00
Brian Goff
59274bcf1f Merge pull request #13202 from duglin/ImportFix 
Fix a regression in `docker import` on error from URL
Upstream-commit: ac81cd1fc36c57b0275992f5e6586728c41dc068
Component: engine
 2015-05-14 10:36:50 -04:00
Doug Davis
cf085c0892 Merge pull request #13208 from ahmetalpbalkan/nit 
Remove out of date comment
Upstream-commit: 1c5a4728e1dec9f154d558e949218e728d464c4e
Component: engine
 2015-05-14 06:59:21 -07:00
Doug Davis
703705b500 Fix a regression in docker import on error from URL 
when the daemon can't download the image from a `docker import` the
error message was lost due to 'err' being redefined with a block by
mistake.  This removes the ":" from "... err := " which fixes it.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 3f4926e49b5f6df00ca09328e990729e00cb1a92
Component: engine
 2015-05-14 06:56:52 -07:00
Ahmet Alp Balkan
b916b32974 Remove out of date comment 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 9448d3627bd655873c3c2e3db38f62d8c54d8349
Component: engine
 2015-05-14 07:37:31 +00:00
Sebastiaan van Stijn
34f1d71bf5 Merge pull request #11706 from HuKeping/time 
Fix inconsistent date formats in API
Upstream-commit: 1d57642906ced778e826f655aed5a0eaab30fe71
Component: engine
 2015-05-13 20:23:19 -07:00
Hu Keping
2e9a18b752 Fix inconsistent date formats in API 
Prior to this patch, the response of
- GET /images/json
- GET /containers/json
- GET /images/(name)/history

display the Created Time as UNIX format which doesn't make sense.

These should be more readable as CLI command `docker inspect` shows.

Due to the case that an older client with a newer version daemon, we
need the version check for now.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 945fc9d882324ac87505e34bb74e6ebe30be1309
Component: engine
 2015-05-14 18:58:55 +08:00
Sebastiaan van Stijn
ab675e423e Merge pull request #12667 from ibuildthecloud/host-uts 
Add --uts=host to allow sharing the UTS namespace
Upstream-commit: ed257420025772acc38c51b0f018de3ee5564d0f
Component: engine
 2015-05-13 18:30:32 -07:00
Darren Shepherd
dc9bbf77b5 Add --uts=host to allow sharing the UTS namespace 
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: f2e5207fc989288ad136d48222df8e7754eb0e9b
Component: engine
 2015-05-13 17:56:32 -07:00
Brian Goff
19c710821b Merge pull request #13201 from Microsoft/10662-fixdebugtrap 
Fix package on debugtrap_unsupported.go
Upstream-commit: f2bc54f7962e415d9aaf77ac57a6dca1ce08e7bd
Component: engine
 2015-05-13 20:44:13 -04:00
Brian Goff
2fa30dbf79 Merge pull request #13112 from hqhq/hq_fix_oonkilldisable 
Fix oom kill disable issue
Upstream-commit: feb0fa8dbf9d14894d65943325c9e64a19cd2ae2
Component: engine
 2015-05-13 20:03:33 -04:00
John Howard
2d29921e20 Fix package on debugtrap_unsupported.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 1e78eec8261d93bcf3eeb7aad123032d81fcbb83
Component: engine
 2015-05-13 16:38:59 -07:00
Antonio Murdaca
397dc5614b Merge pull request #13146 from rajdeepd/dry-run-test-1 
Modified Test Case to include check for Memory and MemorySwap
Upstream-commit: b37abf2528c26251e0a4ea30dcfd025d2151deb0
Component: engine
 2015-05-14 01:10:35 +02:00
Alexander Morozov
cd070e7fe0 Merge pull request #13154 from coolljt0725/typo_remove_redundant_dot 
Minor typo: remove redundant dot in error message in runconfig/parse.go
Upstream-commit: 64ea54c0ed3f0daff40402259e3a2566a51cd4fe
Component: engine
 2015-05-13 15:24:01 -07:00
moxiegirl
20a74613ee Merge pull request #13193 from moxiegirl/dhe-commercial-release 
adding release note for 1.6.2
Upstream-commit: 32f8a40398f83138af61c2825f2a5fe5e519deb3
Component: engine
 2015-05-13 14:51:50 -07:00
Mary Anthony
0be8a8c7ac adding release note for 1.6.2 
Signed-off-by: Mary Anthony <mary@docker.com>

ugh, cut n paste

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 6c17b4818d207ea610fc6937c270a23881f79708
Component: engine
 2015-05-13 13:54:30 -07:00
Michael Crosby
f72477cc8d Bump to version 1.6.2 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Conflicts:
	VERSION
Upstream-commit: cec64ebef849dade38c6ac29fc077f30f9d872d0
Component: engine
 2015-05-13 13:51:39 -07:00
Rajdeep Dua
7a2a7a58a0 Modified Test Case to include check for Memory and MemorySwap 
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com>
Upstream-commit: 1eea2c589da4a4a3f5bfb83f6acf54af83ff4533
Component: engine
 2015-05-13 13:39:07 -07:00
Alexander Morozov
dff7942f86 Merge pull request #13190 from unclejack/precompile_regexp 
Precompile regexp
Upstream-commit: 877461bc2031e104b1f537d08436e36d4c41b9a5
Component: engine
 2015-05-13 13:00:14 -07:00
David Calavera
b9cea2b317 Merge pull request #13155 from coolljt0725/fix_validate_tag_name 
Fix validate tag name. Fix #13149
Upstream-commit: 3da0013ac4c12cacc36dfb8746ed6403e358256f
Component: engine
 2015-05-13 12:03:22 -07:00
Tianon Gravi
1d7b0aaa0c Fix mangled hack/vendor.sh rebase 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: c2d618781183817e74245325add5bddebcb810d2
Component: engine
 2015-05-13 12:52:59 -06:00
unclejack
5de033afb0 pkg/stringid: precompile regexp 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: cb08c1173fae541742af3c8329e00904edef48df
Component: engine
 2015-05-13 21:48:48 +03:00
unclejack
3fb26e927f image: precompile regexp 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 8f57e7d2ef82d39e2c914b799e98ed6243b9b1d0
Component: engine
 2015-05-13 21:47:43 +03:00
Alexander Morozov
c6760c3f88 Merge pull request #13174 from ahmetalpbalkan/TestLogsSince 
integ-cli: Fix race in TestLogsSince
Upstream-commit: 1b678f86b37e836e6f6cf1f58f18fde36672bfce
Component: engine
 2015-05-13 11:35:17 -07:00
Jessie Frazelle
28e112fb4d Merge pull request #13183 from runcom/fix-typo-tests-grouping 
Fix typo to run tests grouped by RunUnprivileged
Upstream-commit: ebe9a854869d1b5470e67e3657a62432e36680a3
Component: engine
 2015-05-13 11:33:14 -07:00
David Calavera
076e804d9c Merge pull request #12226 from ahmetalpbalkan/logdrivers/refactoring 
daemon: Logging drivers architectural refactoring
Upstream-commit: 951c2ef2c94b10ed49f18ca38353c6507c5231fa
Component: engine
 2015-05-13 11:00:50 -07:00
Antonio Murdaca
0ea0631fe7 Fix typo to run tests grouped by RunUnprivileged 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: a36f6a140bb7987c18a8177115cbc315672f9e53
Component: engine
 2015-05-13 14:24:54 +02:00
unclejack
5be78509f7 integcli: change Dettach to Detach 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: fdec5197f145a1aa18329337746f6a94389da0a1
Component: engine
 2015-05-13 12:49:19 +03:00
Lei Jitang
9babc5a64f Fix invalid tag name 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: e00cfbb6f2b953301bfcd7270e9bdfde1a2d17c7
Component: engine
 2015-05-13 14:28:52 +08:00
Antonio Murdaca
5bef2d9b74 Merge pull request #13169 from jfrazelle/cleanup-integration 
cleanup test-integration
Upstream-commit: 3401ee13f838d7d579f6165cc4801ce419f929ff
Component: engine
 2015-05-13 06:34:30 +02:00
Antonio Murdaca
af27a9480d Merge pull request #13106 from duglin/HumanizeCliErrors 
Use stderr instead of logrus for CLI error messages
Upstream-commit: 56847ec4d4c24535bd8f4763e895f609eec9e8cf
Component: engine
 2015-05-13 05:23:56 +02:00
Lei Jitang
4627e314ec Minor typo: remove redundant dot in error message in runconfig/parse.go 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: c6dad07b1bc585f98439dd87deadec062188cbb5
Component: engine
 2015-05-13 11:04:07 +08:00
Ahmet Alp Balkan
276b0e4ce0 integ-cli: Fix race in TestLogsSince 
TestLogsSince used to rely on time synchronization and precision of
the timestamps. This change provides a less flaky alternative.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 2fe2f7a1864068e7d268833bb40536064f69b8aa
Component: engine
 2015-05-13 02:59:11 +00:00
Jessie Frazelle
d58b604612 Merge pull request #11965 from duglin/DEBUG 
Remove use of "DEBUG" env var from CLI and de-couple -D from --log-level
Upstream-commit: 36d995a291c672205d1e8f93f19fb07de253c3d7
Component: engine
 2015-05-12 18:24:04 -07:00
Tibor Vass
71c213ec0b Merge pull request #13131 from Microsoft/10662-loadonwindows 
Windows: Build load.go
Upstream-commit: 3985f1781228d6060228d83e559f14e6d7cc9d7c
Component: engine
 2015-05-12 18:04:33 -07:00
Brian Goff
9c4dfe4f27 Merge pull request #13166 from runcom/small-streamformatter-refactor 
Refactor pkg/stremformatter - custom constructors
Upstream-commit: ec4baad9549448f409af5ec98fa0737b94512824
Component: engine
 2015-05-12 20:28:18 -04:00
Doug Davis
2e83148ffd Use stderr instead of logrus for CLI error messages 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 0024935f641ab596732f9162d3eab795bbc2ae06
Component: engine
 2015-05-12 17:22:41 -07:00
Jessie Frazelle
c55bc07730 Merge pull request #13099 from Microsoft/10662-pkgparsers 
Windows: Implement parsers:kernel+os
Upstream-commit: df89008f0ce17a1ffdbde6a59ef0eade0e885ed8
Component: engine
 2015-05-12 16:07:43 -07:00
Jessica Frazelle
605da98d23 cleanup test-integration 
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: e096d56713b23e076f1adc618b5fd765d9485b45
Component: engine
 2015-05-12 15:39:57 -07:00
Antonio Murdaca
aeecef0f70 Refactor pkg/stremformatter with custom constructors instead of passing a boolean 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 6b700bdacae0b416d8239a0a24729fe327d425d1
Component: engine
 2015-05-13 00:09:41 +02:00
John Howard
00f07a55d3 Windows: Impl pkg\parsers kernel+os 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f7ae2a372d6d845040cdf40b246f4eec62512398
Component: engine
 2015-05-12 14:41:02 -07:00
John Howard
aaf186c8e8 Windows: Build load.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: aed8f9f76e16ed7acc49fbdef5f4563834ac5167
Component: engine
 2015-05-12 14:26:57 -07:00
Jessie Frazelle
fe20784d8c Merge pull request #13040 from cpuguy83/13014_fix_goroutine_leak_on_logs_follow 
Make sure log pipes are closed
Upstream-commit: 37cb2a15bf05f8d0b12423230f57998e90d5d8a2
Component: engine
 2015-05-12 13:52:49 -07:00
Michael Crosby
de6eaa3d3d Merge pull request #13136 from Microsoft/10662-factoroutresolveconf 
Windows: Don't pull in all of resolvconf
Upstream-commit: cb53a628b0b722cac24586bd3bef578a5a8e6ed8
Component: engine
 2015-05-12 13:49:47 -07:00
Michael Crosby
ebd56edbe7 Merge pull request #13162 from jfrazelle/add-modprobe-br_netfilter 
modprobe br_netfilter
Upstream-commit: e0777e69cba057d7c7da360ed2745d9de8b61ed2
Component: engine
 2015-05-12 13:46:34 -07:00
Alexander Morozov
ac35a75674 Merge pull request #13160 from runcom/remove-api-codepath-less-than-1-12 
Remove API codepaths < 1.12
Upstream-commit: f35038dfba2bae0f2183a0caa366e8d7cb959220
Component: engine
 2015-05-12 13:08:36 -07:00
Ahmet Alp Balkan
b1b57c9cd4 daemon: Logging drivers refactoring 
- noplog driver pkg for '--log-driver=none' (null object pattern)
- centralized factory for log drivers (instead of case/switch)
- logging drivers registers themselves to factory upon import
  (easy plug/unplug of drivers in daemon/logdrivers.go)
- daemon now doesn't start with an invalid log driver
- Name() method of loggers is actually now their cli names (made it useful)
- generalized Read() logic, made it unsupported except json-file (preserves
  existing behavior)

Spotted some duplication code around processing of legacy json-file
format, didn't touch that and refactored in both places.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 3a8728b431df07249ad913ea9a12e27dc39b8956
Component: engine
 2015-05-12 19:11:52 +00:00
Jessie Frazelle
15c4056588 Merge pull request #12847 from cpuguy83/fix_firewald_errors 
Fix error message on firewalld init
Upstream-commit: b0518fe0383bff573f8743d179b1cd6df9f5e1e1
Component: engine
 2015-05-12 12:01:59 -07:00
Jessica Frazelle
a641944b1d this fixes hairpin nat tryinng to ping a the host and port from inside a container 
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 4800d4df8c25b0403482bb3ea55891b7091d89f9
Component: engine
 2015-05-12 11:57:36 -07:00