toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,624 Commits 3 Branches 295 Tags
249d122d71d3959ebd2a35efb6fcd23965d301b3
Commit Graph
467 Commits
Author SHA1 Message Date
Zhang Wei 6da53b0de7 clean some redundant else clauses 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: d91ae65280c789307ec67fff7e2d268afe3aeba7
Component: engine
 2015-05-19 10:54:04 +08:00
Antonio Murdaca 0dbe0e42c5 Add RestartPolicy methods instead of using strings checking 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 624bf81fdb980638c422d746bfb82623e9d8bbd1
Component: engine
 2015-05-16 14:15:28 +02:00
Victor Vieux 56ea157723 Revert "Fix inconsistent date formats in API" 
This reverts commit 945fc9d882324ac87505e34bb74e6ebe30be1309.

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: b261ce5fb007371892bc40a5853337db09a1c8ae
Component: engine
 2015-05-14 17:31:45 -07: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
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
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 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
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
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
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 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
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
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 2535832c36 Merge pull request #13141 from vieux/fallback_inspect 
fallback to interface with docker inspect
Upstream-commit: d4eba300657cc60ca03fe774bb42ad6b6f9eca54
Component: engine
 2015-05-12 11:02:06 -07:00
Victor Vieux b969f88e8d fallback to interface with docker inspect 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 52c3bb6a0ec35f34550944b8895d7727301791c9
Component: engine
 2015-05-11 17:39:21 -07:00
John Howard d3339de046 Windows: Don't pull in all of resolvconf 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 78604a9f3fc7d08b39fea0e80dafaa6f8472b050
Component: engine
 2015-05-11 15:28:08 -07:00
Ahmet Alp Balkan 365c18080f Add --since argument to docker logs cmd 
Added --since argument to `docker logs` command. Accept unix
timestamps and shows logs only created after the specified date.

Default value is 0 and passing default value or not specifying
the value in the request causes parameter to be ignored (behavior
prior to this change).

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: cb9a6b9aed1577bb5590300125d05d9b1c201c16
Component: engine
 2015-05-10 20:42:14 +00:00
Ma Shimiao 560ba9b809 add cpu.cfs_period_us support 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: dccb8b5c339e218222bae4ce74bbeccb9e020c82
Component: engine
 2015-05-09 10:02:46 +08:00
Jessie Frazelle 20e9b6f15f Merge pull request #12961 from hqhq/hq_remove_err_out 
a few cleanups for client output
Upstream-commit: 372977148dffe11bc0fee395dfd85dc86a558999
Component: engine
 2015-05-07 16:51:56 -07:00
Arnaud Porterie f6876820fd Merge pull request #11844 from jbarbier/cgroup-parent-42 
Adding cgroup-parent option for docker build
Upstream-commit: e960e4bb129de15b3beb7da37421e32af8dccf2f
Component: engine
 2015-05-05 14:46:47 -07:00
Qiang Huang 50a36ca638 a few cleanups for client output 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 5a6db4fd44c0e05c8b185174a9aa380c9cc4f719
Component: engine
 2015-05-05 15:59:17 +08:00
Tibor Vass da6438ab18 Merge pull request #10766 from cpuguy83/stats_pull_once 
Allow pulling stats once and disconnecting.
Upstream-commit: 91fb4d672a8536d2f0437aeeb2dfc7b9e51aac16
Component: engine
 2015-05-04 22:28:01 -07:00
Brian Goff 9531505238 Allow pulling stats once and disconnecting. 
Adds a `stream` query param to the stats API which allows API users to
only collect one stats entry and disconnect instead of keeping the
connection alive to stream more stats.

Also adds a `--no-stream` flag to `docker stats` which does the same

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f3023a93d1a0a96a7312de441a550c758ac0c17d
Component: engine
 2015-05-04 10:49:13 -04:00
Doug Davis 703dea0308 Merge pull request #12735 from jmzwcn/patch-1 
Remove empty line after client.CmdInspect docstring
Upstream-commit: 15313dfdf38ecaa0dc93005f1c3824491fbb3b96
Component: engine
 2015-05-03 11:10:14 -04:00
jmzwcn c5e187ce2d Remove empty line after client.CmdInspect docstring #12706 
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>

Remove empty line after client.CmdInspect docstring

fix #12706
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>

Remove empty line after client.CmdInspect docstring

fix #12706
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
Upstream-commit: 28547a1a3a594ee24b4cb51a89d9fce630c8c066
Component: engine
 2015-05-03 17:23:18 +08:00
Alexander Morozov 57496db316 Merge pull request #12924 from runcom/provide-struct-to-cli-stream 
Provide a struct to configure cli streaming
Upstream-commit: 393678474f7364b44e7b26b5e9a99aabf1762724
Component: engine
 2015-05-01 15:10:58 -07:00
Antonio Murdaca cad4e1508b Provide a struct to configure cli streaming 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: d9639409fd54ee6955793474fa9a5bac1e583c77
Component: engine
 2015-05-01 20:23:44 +02:00
Qiang Huang 96a8cfc20a fix docker rm name issue 
Addresses https://github.com/docker/docker/issues/12308

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 79f13d1497b073113f713e903e934dafcf78c42f
Component: engine
 2015-05-01 22:26:40 +08:00
Doug Davis 43117afa87 Don't wrap 'cp' help too soon. 
Minor thing but docker cp --help was:
Copy files/folders from a PATH on the container to a HOSTDIR on the host
running the command. Use '-' to write the data
as a tar file to STDOUT.

This changes it to:
Copy files/folders from a PATH on the container to a HOSTDIR on the host
running the command. Use '-' to write the data as a tar file to STDOUT.

The \n made the output look funky.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 68ee5bdf96f1653d73e29329506949a765398a40
Component: engine
 2015-04-30 14:43:14 -07:00
Antonio Murdaca 016ac4bf61 Remove engine mechanism 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 531f4122bdcd4de289f613a5ef010f4c1989f098
Component: engine
 2015-04-30 01:35:16 +02:00
Doug Davis 53d8f39607 Remove use of "DEBUG" env var from CLI and decouple DEBUG from --log-level 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 534ed8c2d4573e88fcb68b23341504f8949b34b5
Component: engine
 2015-04-29 06:20:33 -07:00
Brian Goff 93d4e49319 Merge pull request #12870 from coolljt0725/fix_rename_help 
Fix docker rename help not consistent with other commands
Upstream-commit: f2f8e4c5c9c89e3df59cb3123fa30a0eb6592ddb
Component: engine
 2015-04-29 09:14:03 -04:00
Lei Jitang b38b865566 Fix docker rename help not consistent with other commands 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 0e752adf550ef4891e40889ea92e12ec3d775a00
Component: engine
 2015-04-29 19:37:20 +08:00
Qiang Huang d6802adb29 fix a minor inspect format issue 
Before, inspect cont1 cont2 shows:
[{
    xxx
}
,{
    xxx
}
]
After, it shows:
[
{
   xxx
}
,{
    xxx
}
]

Because `func (*Encoder) Encode` always followed by a newline character,
so it's difficult to put '}' and ']' one the same line.

To get symmetry, above is our choice.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: c7812f01c7269c713c2243fe8a69b55cdb77b72a
Component: engine
 2015-04-28 18:51:04 +08:00
Antonio Murdaca 954f940156 Small if err cleaning 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 844538142d95c1b7dda1bb2903179510105fe9b5
Component: engine
 2015-04-27 21:50:33 +02:00
Tibor Vass 6a2c490ba2 Merge pull request #12333 from Mashimiao/clean-up-viz 
Clean up viz code
Upstream-commit: 572ba9cb407f3c383367c67b1a6d3da612ece4a7
Component: engine
 2015-04-27 14:13:03 -04:00
He Simei 5d5dd54df9 remove useless http call from export 
Signed-off-by: He Simei <hesimei@zju.edu.cn>
Upstream-commit: 6d9439c627e36349679249d991400da45eb75587
Component: engine
 2015-04-27 12:41:03 +08:00
Julien Barbier 7a068916d5 Happy birthday Docker! cgroup-parent option for docker build. Thanks to Michael, Nathan and Jessie for their support! #42 
Signed-off-by: Julien Barbier <write0@gmail.com>
Upstream-commit: bb411939989dabb56eb604b9a873d1dfbf0646ef
Component: engine
 2015-04-25 15:25:51 -04:00
Alexander Morozov cc66f7a04e Merge pull request #12502 from calavera/shallow_git_history 
Shallow clone using git to build images.
Upstream-commit: 790c63a5ef34d54ae8ba79886b6c8daae547bf25
Component: engine
 2015-04-24 10:16:01 -07:00
David Calavera dfd9ef2b64 Remove duplicated git clone logic. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1cfb307d70558110e8e88a7391ae0e6cf6ebf174
Component: engine
 2015-04-24 09:39:45 -07:00
Lei Jitang 734115a06e Add cpu cfs quota to build 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 5f4fb8be006c0ffeff2671e5752111e543e07d9f
Component: engine
 2015-04-24 08:54:08 +08:00
Ma Shimiao 8910bbac66 clean up viz code 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 66acef865d7504605572b0d9566d9e250cf19bc2
Component: engine
 2015-04-24 08:38:14 +08:00
Alexander Morozov 1c64e12359 Merge pull request #11839 from brahmaroutu/template_11641 
Allow go template to work properly with inspect …
Upstream-commit: 799cf056e7f672f987b0b44adf0868ce56caab8b
Component: engine
 2015-04-23 13:07:40 -07:00
Arnaud Porterie 079bd06b02 Merge pull request #12577 from jfrazelle/actually-depreciate-rm 
actually depreciate -rm insteam of --rm.. and a few others
Upstream-commit: c4914f071ffad203bc4ed16404f7ddc985a5f63e
Component: engine
 2015-04-23 11:55:20 -07:00
Srini Brahmaroutu 12be8c3158 Allow go template to work properly with inspect 
Closes #11641

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 231d362db73310a5243a72dcdb6df2df57c74488
Component: engine
 2015-04-23 18:25:18 +00:00
Doug Davis c8f1332dce Move CLI config processing out from under registry dir 
No logic changes should be in here, just moving things around.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: bb9da6ba9294a8eab8f4dfaf7cf07c57959fe608
Component: engine
 2015-04-23 10:18:38 -07:00
Doug Davis 0b0a96ad89 Merge pull request #12390 from hqhq/hq_fix_inspect 
fix inspect format result
Upstream-commit: eae272f90eb6c01824112054140b5dc7d9d679ce
Component: engine
 2015-04-22 23:06:13 -04:00