toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,561 Commits 3 Branches 295 Tags
581cc188efccc7edb90867fd1d3ea9cc4defe488
Commit Graph
15561 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Morozov 581cc188ef Merge pull request #13246 from unclejack/refactor_statscollector 
daemon/stats_collector: refactor getSystemCpuUsage
Upstream-commit: 88127ce475ead0cf491ea64a0b4ec4074a25b173
Component: engine
 2015-05-15 11:06:47 -07:00
Michael Crosby cb0887401b Merge pull request #13236 from vieux/revert_time_change 
Revert "Fix inconsistent date formats in API"
Upstream-commit: 520955b1cfaa65dbb4609c414c8d913327ee4520
Component: engine
 2015-05-15 10:32:03 -07:00
Alexander Morozov eec633b1b4 Merge pull request #13251 from cpuguy83/13233_fix_log_follow_goroutine_check 
Extend sleep/timeout for ngoroutine check
Upstream-commit: 5d2ef30a389239d6f5a3a6d1c43c9567a07569ac
Component: engine
 2015-05-15 08:57:25 -07:00
Brian Goff 3d94b2d4e8 Merge pull request #13220 from Microsoft/10662-sysinfo 
Windows: Refactor sysinfo for compilation
Upstream-commit: 248e5a4c8351e7dcf0db73808e3581d73e2ed135
Component: engine
 2015-05-15 10:53:55 -04:00
Brian Goff b4723c0fb7 Merge pull request #13243 from coolljt0725/remove_redundant_log 
Cleanup:Remove redundant log in pkg/pidfile/pidfile.go
Upstream-commit: 2c8eba14df509a2ccb74afa2f6c6ab02cb707727
Component: engine
 2015-05-15 10:13:19 -04:00
Brian Goff 74818dcd57 Extend sleep/timeout for ngoroutine check 
In cases where this is failing it's ok to have the test take extra time,
but we don't want it to fail because of some race/performance
differences between systems.
So make the timeout go to 30s and double the sleep time in between
checks so it's not pounding the daemon quite so fast.

Originally I couldn't make this test fail (pre-change), but changed
graphdrivers and saw a failure pretty quickly.
This change seems to smooth that out.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f207322c0a017adcce2da04473626f040e08267c
Component: engine
 2015-05-15 09:54:43 -04:00
unclejack 091bd3b25b daemon/stats_collector: refactor getSystemCpuUsage 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 25f776451e88a52c2677d5c56383f03a1a4c539f
Component: engine
 2015-05-15 12:22:50 +03:00
Lei Jitang f9e7dda027 Remove redundant log in pkg/pidfile/pidfile.go 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 60e5c273cfde9fac1ac09ebcc666977232115f65
Component: engine
 2015-05-15 15:26:00 +08: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
David Calavera 5edd0d62d2 Merge pull request #13188 from ahmetalpbalkan/inputs-standard-rfc3339 
Parse input timestamps with standard RFC3339
Upstream-commit: e4855eebf229fa1ebddf254a6c32804425ae8c56
Component: engine
 2015-05-14 16:49:01 -07:00
Tibor Vass b0f3ea455f Merge pull request #12770 from Microsoft/10662-daemonconfigrefactor 
Windows: Start of daemon config refactor
Upstream-commit: c5240d79e391a7ce499fd59abab69f5504615f21
Component: engine
 2015-05-14 14:55:22 -07:00
Brian Goff af04c73a3c Merge pull request #13223 from Microsoft/10662-loggers 
Windows: Factor out syslog and journald
Upstream-commit: a4592467e7e8c4a045ddc0e0d2e0efd5ed376813
Component: engine
 2015-05-14 16:26:43 -04:00
Alexander Morozov 6d5c4d91dd Merge pull request #13196 from crosbymichael/update-libocntainer-may13 
Update libcontainer to a37b2a4f152e2a1c9de596f54c0
Upstream-commit: b2ad9314a2e9bce481275c8d3c08e5e1b9f04523
Component: engine
 2015-05-14 10:49:25 -07:00
John Howard 38fd09288b Windows: Factor out syslog and journald 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 655a58e27bfcfd2494bb5d46f95cb49d655ad17a
Component: engine
 2015-05-14 10:34:09 -07:00
John Howard fb9d7fcfdc Windows: Refactor sysinfo for compilation 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b7ee717a10db00858c441f78f2f1a47e2a9493a1
Component: engine
 2015-05-14 09:44:51 -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 c16c9cc586 Parse input timestamps with standard RFC3339 
Fix for #13175.

This change allows user-input timestamps (e.g. to `docker events
--since/--until`  or `docker logs --since` to be parsed using
standard RFC3339Nano layout in Go instead of the layout that parses
all timestamps into fixed-length strings (currently buggy).

User inputs need not to be complying to the internal format
(`RFC3339NanoFixed`) anyway.

Added test case for `events --since/--until` with all possible
timestamp input formats.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 999f464feb5b78e8ecc97625e70f3b1796d0a758
Component: engine
 2015-05-14 07:44:42 +00: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
Michael Crosby 2df1795660 Update test for /sys mounting 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 677d76cd4aadf7514a3ba4e6761880fc3817f573
Component: engine
 2015-05-13 15:02:53 -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
Alexander Morozov b3410f7752 Merge pull request #13194 from crosbymichael/merge_release_v1.6.2 
Merge release 1.6.2
Upstream-commit: 31c81122855cb984057d7b0c9865018e2e4b7e09
Component: engine
 2015-05-13 14:01:40 -07:00
Michael Crosby eaedb9b85a Update libcontainer to a37b2a4f152e2a1c9de596f54c0 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 87c35d0e0af930d1c7ac03f852287348f7f9d240
Component: engine
 2015-05-13 13:55:26 -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
Michael Crosby 2f381e17ae Merge pull request #13192 from tianon/fix-bad-vendor.sh-rebase 
Fix mangled hack/vendor.sh rebase
Upstream-commit: c46c8f4e4082552dd9ea003aaf71fbf52ba983a1
Component: engine
 2015-05-13 12:02:07 -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
Brian Goff a7920a7e08 Merge pull request #13180 from unclejack/fix_test_name 
integcli: change Dettach to Detach
Upstream-commit: 8eac7d0779626d3bc1f2907a4497720616f41717
Component: engine
 2015-05-13 09:07:18 -04: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