toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,409 Commits 3 Branches 295 Tags
7a04c92cc82c6fd0ccc40d7858c86152dc5a9900
Commit Graph
18409 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tibor Vass 7a04c92cc8 Merge pull request #16437 from runcom/invalid-logger-address 
daemon: logger: error out on daemon start if invalid logger address
Upstream-commit: d572bab4a09eb7d60961867d2d2f9896595a3271
Component: engine
 2015-09-21 14:53:47 -04:00
Alexandre Beslic a3f8f51f2a Merge pull request #15029 from azurezk/add-version-info 
Add docker version info in /info request
Upstream-commit: 40edb5f97c3ba95e450c8280b29d0ef027b51cfb
Component: engine
 2015-09-21 11:44:11 -07:00
moxiegirl c8b313872b Merge pull request #16449 from runcom/add-container-label-userguide 
docs: userguide: add container labels section
Upstream-commit: f018c0430bd9a2c8dfe415aeb11e0ede2b435773
Component: engine
 2015-09-21 10:26:20 -07:00
Alexandre Beslic 7fa0a79ba9 Merge pull request #16440 from runcom/tempdir-check-errs 
integration-cli: check err on tmp dir creation
Upstream-commit: 587558f617e602c0a690c751d96ccddea3f648d3
Component: engine
 2015-09-21 08:06:08 -07:00
Zhang Kun 8e71940329 add docker server version to /info 
Signed-off-by: Zhang Kun <zkazure@gmail.com>
Upstream-commit: 7cf343d1064e3d8211597c67574ff4ddff316fa1
Component: engine
 2015-09-21 21:15:32 +08:00
Brian Goff d006ffc2e0 Merge pull request #16443 from coolljt0725/simplify_volume_code 
Cleanup: remove unnecessary return at the end of block in volume.go
Upstream-commit: 743dc1c791e5a78c881180fdad2fc3be19ad7c8d
Component: engine
 2015-09-21 09:05:16 -04:00
Antonio Murdaca 361e22d91a docs: userguide: add container labels section 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 124540c08603f1eda956f16e2eef2f42d3b3e80f
Component: engine
 2015-09-21 14:41:22 +02:00
Lei Jitang 7f1e77e56a Cleanup: remove unnecessary return at the end of block in volumes.go 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 5746eb950130793a1833860b7bc03c2c8fa7b46f
Component: engine
 2015-09-21 04:32:37 -04:00
David Calavera d572cd9e37 Merge pull request #16174 from sallyom/man-restart-fix 
docker restarts running OR stopped containers
Upstream-commit: 4a6e8c8f3c8d129bb06922a0d8e1e1276c254f66
Component: engine
 2015-09-20 18:10:06 -07:00
Antonio Murdaca 7020653250 api: server: container: fix wrong comment 
This comment was wrongly referring to the old job mechanism and it
wasn't clear what it was trying to document.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 76b3b5431475709b27f0c113f9319321388a49d1
Component: engine
 2015-09-21 00:46:16 +02:00
Antonio Murdaca 82a956ef62 integration-cli: check err on tmp dir creation 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: b616b8a17a9f61881c83c2324399856e466a0805
Component: engine
 2015-09-21 00:00:55 +02:00
moxiegirl fe1da9c698 Merge pull request #16425 from charleswhchan/fix-version-doc 
Add missing '[OPTIONS]' arg to documentation for 'docker version'.
Upstream-commit: 4133401bf992826e4923d0734e4f09c4c7f68882
Component: engine
 2015-09-20 14:33:47 -07:00
Antonio Murdaca 72ffa04366 daemon: logger: error out on daemon start if invalid logger address 
If an invalid logger address is provided on daemon start it will
silently fail. As syslog driver is doing, this check should be done on
daemon start and prevent it from starting even in other drivers.
This patch also adds integration tests for this behavior.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: e3c472426ff1dccf083e41dbbfdf5935921bf330
Component: engine
 2015-09-20 16:20:25 +02:00
Sally O'Malley 4168ba7ed4 docker restarts running OR stopped containers, docs edit rm "running" 
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: e41753678d5ffd6c505f1984943bc36d34e134bb
Component: engine
 2015-09-20 09:16:27 -04:00
Doug Davis b3b1f3bcbe Merge pull request #16430 from runcom/pkg-integration-fix-format 
pkg: integration: utils_test: fix int format
Upstream-commit: 148be8bd7efd2cdb74b0cd9466fccb57c4c51834
Component: engine
 2015-09-20 06:48:58 -05:00
Antonio Murdaca c2899cc7c9 pkg: integration: utils_test: fix int format 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: c219311fd89b21aecc44895e3177ea3fc5b973d6
Component: engine
 2015-09-20 02:42:08 +02:00
Sebastiaan van Stijn 17451ec748 Merge pull request #16414 from sunyuan3/dockertest 
Add timeout description.
Upstream-commit: acdc0f82c03133ddddd36ec8b12ef13b68035eda
Component: engine
 2015-09-19 22:20:10 +02:00
Charles Chan ca451265c5 Add missing '[OPTIONS]' arg to documentation for 'docker version'. 
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 8d6796f8c63ae09ce35a56525a947ae1aa887b0b
Component: engine
 2015-09-19 08:53:11 -07:00
Brian Goff 16952d5c9b Merge pull request #16363 from coolljt0725/fix_net_none_test 
Fix --net none test closes #16356
Upstream-commit: 7d5603e7cbc8799789b356adf354c1859e4974e7
Component: engine
 2015-09-19 09:25:12 -04:00
Yuan Sun 282912af5d Add timeout description. 
It is almost impossible to take serveral minutes to complete all the
test.

Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 76c96da4878a8b4ca6f5c9628448fa04401a32ec
Component: engine
 2015-09-19 10:24:16 +08:00
Lei Jitang fde5729def Fix --net none test closes #16356 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 0b2091132a6db1a9887626e1e85ca644c50dcbb4
Component: engine
 2015-09-18 20:49:36 -04:00
Doug Davis a31daab9bb Merge pull request #16409 from runcom/fix-tests 
integration-cli: fix tests with memory limit
Upstream-commit: 536353e87f83ca9869139a16aa80f6140fc504d4
Component: engine
 2015-09-18 19:47:16 -04:00
Jess Frazelle be9c8b7551 Merge pull request #16405 from michaelhuettermann/master 
Adding another scientist to the hall of fame.
Upstream-commit: bf892efe3658446b1b1b749043de4943556591ad
Component: engine
 2015-09-18 16:09:01 -07:00
Jess Frazelle 19c6980ba8 Merge pull request #16407 from Microsoft/10662-fixinfoprocerror 
Windows: Fix error in daemon log on info
Upstream-commit: 16f60347bc316ec67a732e107924ad3e40ca557e
Component: engine
 2015-09-18 16:08:45 -07:00
Antonio Murdaca f242555aaa integration-cli: fix tests with memory limit 
If you don't have cgroup swap memory support, `dockerCmd`'s output in
these tests will be polluted by a warning from the daemon and will fail
the tests.
No need to have memory swap support for these tests to run as it will
be reset to -1 and everything will continue correctly.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 0b8b8ed9e98a7355661f1aad93bfa0dd76362723
Component: engine
 2015-09-19 00:07:40 +02:00
John Howard af83f1caed Windows: Fix warning on info 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 8d56108ffb4e334600377c4bb4471eecec7b825c
Component: engine
 2015-09-18 13:39:12 -07:00
David Calavera 64aea80dba Merge pull request #16349 from cpuguy83/16302_deprecate_autocreate_binds 
deprecate bind path auto-create
Upstream-commit: e61abac5fa1c1ce2330e34c8eb51d9592dde2dd3
Component: engine
 2015-09-18 12:53:06 -07:00
michaelhuettermann 5b887ca863 Adding another scientist to the hall of fame. 
Signed-off-by: Michael Hüttermann <michael@huettermann.net>
Upstream-commit: 3e212eec5ea6018d4a001574748df0ce9e0f3e32
Component: engine
 2015-09-18 21:31:12 +02:00
Alexandre Beslic f1ab116cf0 Merge pull request #16403 from runcom/fix-containers-json-emtpy-response 
Fix GET /containers/json emtpy response regression
Upstream-commit: 96f9efc0636be5d89fd242e7a5aa96485b80ad01
Component: engine
 2015-09-18 11:47:42 -07:00
Brian Goff df7d3018bd Merge pull request #16317 from vbatts/vbatts-event-timenano 
jsonmessage: add and use TimeNano for events
Upstream-commit: 45d7acf237555835f2872a404abedff366420883
Component: engine
 2015-09-18 14:41:45 -04:00
Vincent Batts cdae9e4a30 events/jsonmessage: add and prefer TimeNano for events 
This way provide both Time and TimeNano in the event. For the display of
the JSONMessage, use either, but prefer TimeNano Proving only TimeNano
would break Subscribers that are using the `Time` field, so both are set
for backwards compatibility.

The events logging uses nano formatting, but only provides a Unix()
time, therefor ordering may get lost in the output. Example:
```
2015-09-15T14:18:51.000000000-04:00 ee46febd64ac629f7de9cd8bf58582e6f263d97ff46896adc5b508db804682da: (from busybox) resize
2015-09-15T14:18:51.000000000-04:00 a78c9149b1c0474502a117efaa814541926c2ae6ec3c76607e1c931b84c3a44b: (from busybox) resize
```

By having a field just for Nano time, when set, the marshalling back to
`time.Unix(sec int64, nsec int64)` has zeros exactly where it needs to.
This does not break any existing use of jsonmessage.JSONMessage, but now
allows for use of `UnixNano()` and get event formatting that has
distinguishable order. Example:
```
2015-09-15T15:37:23.810295632-04:00 6adcf8ed9f5f5ec059a915466cd1cde86a18b4a085fc3af405e9cc9fecbbbbaf: (from busybox) resize
2015-09-15T15:37:23.810412202-04:00 6b7c5bfdc3f902096f5a91e628f21bd4b56e32590c5b4b97044aafc005ddcb0d: (from busybox) resize
```

Including tests for TimeNano and updated event API reference doc.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 4026512a2c535fe377a4cf834b7a78fccfd82dab
Component: engine
 2015-09-18 13:15:26 -04:00
Antonio Murdaca a5c36fcdf5 Merge pull request #16389 from HuKeping/stats-zero 
Reset data of stats in docker cli when container stopped
Upstream-commit: 41646cb4e318b025a5a5c627481e551c49f726e2
Component: engine
 2015-09-18 18:59:51 +02:00
Antonio Murdaca 3afb789aff Fix GET /containers/json emtpy response regression 
GET /containers/json route used to reply with and empty array `[]` when no
containers where available. Daemon containers list refactor introduced
this bug by declaring an empty slice istead of initializing it as well
and it was now replying with `null`.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 26bd5e3a2da3157f0bcb6654c30b6eccedf7f3f3
Component: engine
 2015-09-18 18:44:46 +02:00
David Calavera 5fba122c28 Merge pull request #16260 from sunyuan3/comment 
Correct wrong comment for TestRunWithoutMemoryswapLimit case.
Upstream-commit: 72eb75a06c8533ada2062454de4981c46db63fb7
Component: engine
 2015-09-18 09:22:49 -07:00
Phil Estes 08934e2807 Merge pull request #16378 from duglin/MoveErrors 
Move api/errors/ to errors/
Upstream-commit: c4d4318b82f8246b908981504c7975ba3ed5dd3b
Component: engine
 2015-09-18 10:42:12 -04:00
Brian Goff 4e8ec3d151 deprecate bind path auto-create 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 249f45bcfe1adf4b3550306951f2768b17802217
Component: engine
 2015-09-18 10:28:38 -04:00
Hu Keping 5be2b08002 Reset data of stats in docker cli when container stopped 
When use `docker stats` to minitor a running container and then stop it,
there are some fields need to be reset to zero. Otherwise it will keep
displaying the data it received last time.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: da67833e63f317d8f20ffed5c3250f442900bdae
Component: engine
 2015-09-18 15:24:13 +08:00
Yuan Sun 0cc2676e92 Correct wrong comment for TestRunWithoutMemoryswapLimit case. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: cf6a53642a0abdec9e2b2269d522a20e2a885f65
Component: engine
 2015-09-18 08:28:36 +08:00
moxiegirl 238b3791d0 Merge pull request #15327 from flavio/update-suse-docs 
Update SUSE docs
Upstream-commit: d2e7ba42b10fda5961470adc4ba4d74011203e60
Component: engine
 2015-09-17 16:46:26 -07:00
Jess Frazelle 2a20dd0c76 Merge pull request #16377 from runcom/add-stats-tests 
integration-cli: add cli/api stats tests when container not found
Upstream-commit: 52d7542195e301cb45be9b5ff210a39c975cde02
Component: engine
 2015-09-17 13:43:02 -07:00
Jess Frazelle f0cc64a32d Merge pull request #16364 from wcwxyz/master 
Preserve /etc/sysconfig/docker across rpm update
Upstream-commit: 4a707c9ad9f5055a090e7402b2ab5e9ee145837f
Component: engine
 2015-09-17 13:36:17 -07:00
Doug Davis 3904dd3167 Move api/errors/ to errors/ 
Per @calavera's suggestion: https://github.com/docker/docker/pull/16355#issuecomment-141139220

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: a283a30fb026aad4434a9f2e34f7ce955d27a957
Component: engine
 2015-09-17 11:54:14 -07:00
Jess Frazelle c5612022ae Merge pull request #16271 from runcom/deprecate-cli-opts 
Deprecate -c cli short variant flag in docker run
Upstream-commit: 4702d45599bf69b525a58c804d175732b934591e
Component: engine
 2015-09-17 11:52:59 -07:00
Jess Frazelle ebaf24310f Merge pull request #16354 from tomdee/patch-3 
Update the instructions for building experimental docker binaries
Upstream-commit: 96c735a72405a3a8d479b50ec25f91bd72923aa2
Component: engine
 2015-09-17 11:50:07 -07:00
Jess Frazelle 2d5e18cda2 Merge pull request #16355 from duglin/DaemonErrors 
Convert some "daemon" static error strings to the new errocode package format
Upstream-commit: 828e4ac45a5b4954997949570b9b032c57137849
Component: engine
 2015-09-17 11:48:37 -07:00
David Calavera 61d5ad0174 Merge pull request #16375 from sunyuan3/makefile 
from make file to Makefile
Upstream-commit: 57c6012cf0dbe1097b2b876b0fbca5fa6dbf0e81
Component: engine
 2015-09-17 10:10:18 -07:00
Antonio Murdaca e0ab2a79d7 integration-cli: add cli/api stats tests when container not found 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 66be81b148a1c6693c44cf52d8172d512eedc233
Component: engine
 2015-09-17 18:20:25 +02:00
David Calavera 0203472d5b Merge pull request #15898 from Microsoft/15775-buildcontextfix 
Windows: Fix long path handling for docker build
Upstream-commit: cfd3080a8004738c34ecf1ae0e6cd2f82638c78b
Component: engine
 2015-09-17 09:19:23 -07:00
Yuan Sun 3794bfe695 from make file to Makefile 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 5e7895ee2159552ddd65a91f38bd87a1999328a0
Component: engine
 2015-09-17 15:37:50 +00:00
Antonio Murdaca 3d67e39b1a Merge pull request #16370 from mountkin/daemon-cleanup 
remove the unused run() and output() functions in daemon/container.go
Upstream-commit: e33b8b11afd9d2b830ffed11f3c70e7448be1ff4
Component: engine
 2015-09-17 17:33:55 +02:00