toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,685 Commits 3 Branches 295 Tags
0b6f77080dcdd4534b7fdf0d145477fd5dcad434
Commit Graph
1003 Commits
Author SHA1 Message Date
Jessie Frazelle 31b9b2a976 Merge pull request #11326 from cpuguy83/11315_rename_w_daemon_restart 
Persist container to disk after rename
Upstream-commit: c6321931d234a190bf0696d0ab5711425c83480c
Component: engine
 2015-03-11 13:44:13 -07:00
Brian Goff e7e0b4ff1a Persist container to disk after rename 
Fixes #11315

After rename occured the graphdb was updated but the container struct
was never commited back to disk, so on daemon restart it loads the old
name again.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: c5c72cf151b21482b2f27417322342c6d781108c
Component: engine
 2015-03-11 12:39:31 -07:00
moxiegirl 424b1cdcc8 Merge pull request #11291 from ahmetalpbalkan/info/system-date 
Add system time to /info
Upstream-commit: d010bf0d994ce562a3be693f6afef71d55bea887
Component: engine
 2015-03-11 09:43:43 -07:00
Deng Guangxing b951eb79db Fix minor typo 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: ce1a0b612d300210fadf12556e1b38885f098197
Component: engine
 2015-03-11 11:13:39 +08:00
Ahmet Alp Balkan f486128375 Add system time to /info 
This change adds daemon's system time as RFC3339Nano to the `/info` endpoint
and shows in a more readable format (UnixDate) in `docker -D info` output.

I will be using this to fix the clock skew between the remote test host and
the CI machines running `docker events`-related tests as they're using `--since`
and `--until` and the timestamps are not matching when daemon is not on the
same machine.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 2977fd2b7aed42008ca2ad90dcd8fec5ead4e86b
Component: engine
 2015-03-10 15:29:05 -07:00
Jessie Frazelle d3dac115e9 Merge pull request #11211 from cpuguy83/ensure_engine_shutdown 
Ensure clean engine shutdown on startup errors
Upstream-commit: e4b753c1de558a07a8a079b39013677211badbd7
Component: engine
 2015-03-10 12:13:35 -07:00
Alexander Morozov 393b1a4214 Setup user groups in lxc driver 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 821ec8334fd4ff3500b4e2d2338f3cc8935e17bd
Component: engine
 2015-03-10 09:43:11 -07:00
Alexander Morozov f2f7f591d4 Use CgroupString instead of missing GetCgroupAllowString in lxc_template 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: c8c11bfc363363fcc26da5868292544cbabea320
Component: engine
 2015-03-10 08:50:03 -07:00
Jessie Frazelle 02ceac919e Merge pull request #11208 from LK4D4/new_libcontainer_api 
New libcontainer api
Upstream-commit: 2fb89b2e2ca1043abf8d4c02532ce42135efe6f6
Component: engine
 2015-03-10 07:50:19 -07:00
Brian Goff fa734b0de4 Ensure clean engine shutdown on startup errors 
Previously on error either from the daemon or from the api it is just
exiting with exit status 1 but not performing a shutdown.
This can produce insconsistent state depending on where the error came
from.

This makes sure that before we exit on error that the engine gets fully
shutdown.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 0e3f2f2ac07c69922bd837f864219a088d243248
Component: engine
 2015-03-09 08:40:38 -04:00
Arnaud Porterie 5506a9a27c Remove subdirectories MAINTAINERS files 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 89bdaa35e04b74b7c6528783e0f7b8154b2a3d31
Component: engine
 2015-03-06 18:21:51 -08:00
Alexander Morozov 3b04936e06 Execdriver implementation on new libcontainer API 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 68ba5f0b69c9f383269fb5bc2c78798b312e98cc
Component: engine
 2015-03-06 14:46:58 -08:00
Zhang Wentao 6bfc416abd docker info display http/https_proxy setting 
Signed-off-by: Zhang Wentao <zhangwentao234@huawei.com>
Upstream-commit: 06a40f0f281b4679855a406bc202e122d2875949
Component: engine
 2015-03-06 09:02:21 +08:00
Michael Crosby 04c84acfda Merge pull request #11064 from delftswa2014/10970-treesize 
Move directory size calculation to pkg/ (fixes #10970)
Upstream-commit: 92e632c84e7b1abc1a2c5cb3a22e0725951a82af
Component: engine
 2015-03-05 13:06:02 -08:00
Dan Walsh ae82ea5f07 Two SELinux Changes. 
daemon/volumes.go

  This SetFileCon call made no sense, it was changing the labels of any
directory mounted into the containers SELinux label.  If it came from me,
then I apologize since it is a huge bug.

The Volumes Mount code should optionally do this, but it should not always
happen, and should never happen on a --privileged container.

The change to

daemon/graphdriver/vfs/driver.go, is a simplification since this it not
a relabel, it is only a setting of the shared label for docker volumes.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 4eb2fd169f8c9adbee4a9a0bd387f96b4e725963
Component: engine
 2015-03-05 13:55:44 -05:00
Phil Estes ac978258f3 Merge pull request #11163 from duglin/RmiTest 
Better error message for `docker rmi ''`
Upstream-commit: 214eae6f53fb143be9dacd1881e2ec1c56a6bb26
Component: engine
 2015-03-05 09:49:46 -05:00
Sven Dowideit 8d2cefd5a5 Seems like an un-necessary if statement 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 4e5ea0c8755231dfffd7b82bc6551415b14ed0de
Component: engine
 2015-03-04 13:24:17 -08:00
Doug Davis f888d145c2 Better error message for "docker rmi ''" 
See: https://github.com/docker/docker/issues/10867

While looking at #10867 I noticed that the error message generated for
a blank image ID wasn't very helpful so this fixes that.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: eeb36c9348b7af339638936a98d66ee4f9be62ee
Component: engine
 2015-03-04 13:21:59 -08:00
Martijn Dwars 459803f719 Move directory size calculation to pkg/ (fixes #10970) 
Signed-off-by: Martijn Dwars <ikben@martijndwars.nl>
Upstream-commit: e2b8933d213b283578babc1d86538950295e4fc7
Component: engine
 2015-03-04 21:16:31 +01:00
Jessie Frazelle 97033cc69f Merge pull request #10586 from resouer/10532-fix-cors-hardcode 
Fix 10532 to change --api-enable-cors to string.
Upstream-commit: 7b3ffd5cc0b293aac67e2c07948b2e68525b72d1
Component: engine
 2015-03-04 18:42:20 +00:00
Phil Estes c154ff2dc2 Merge pull request #10713 from swagiaal/pickup-created-resolvconf 
Update resolv.conf in containers on file creation.
Upstream-commit: 2380004d30769e9abc2a975dc9f89d83cc459d5f
Component: engine
 2015-03-04 10:21:36 -05:00
Phil Estes 3ad72ddc8c Merge pull request #11155 from coolljt0725/add_xfs_magic 
Fix docker info show unknown backing filesystem when use xfs
Upstream-commit: e2c79e2b307e9a3ca9fa4719cd536b03c167365b
Component: engine
 2015-03-04 07:59:23 -05:00
Jessie Frazelle 36f1975bfd Merge pull request #9437 from cpuguy83/set_rlimits_in_container 
Allow setting ulimits for containers
Upstream-commit: df7ba57f5f962b1a2d2e267a89ae465541a92371
Component: engine
 2015-03-04 04:00:17 -08:00
Lei Jitang e00d9f2fa2 Add xfs fs magic to graphdriver/driver.go 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: dd56fa190695a969673f6f663cd5fe78b7c22787
Component: engine
 2015-03-04 19:01:39 +08:00
Zen Lin(Zhinan Lin) 1e821173bd Just format some logs and notes in /daemon/networkdriver/bridge/driver.go 
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
Upstream-commit: 2c0e027ab9b7da131451d571c4d0f25bc5fc14eb
Component: engine
 2015-03-03 23:39:04 +08:00
resouer d382609cd2 Rebase & update api doc v1.18 instead 
Signed-off-by: harry zhang <resouer@163.com>
Upstream-commit: dc0a6c1f5edd78d23ab676c54c3e84df3c2b2bbf
Component: engine
 2015-03-03 12:32:17 +08:00
resouer f947fbc4ae Add cors header flag and leave boolean flag not changed 
Deprecate api-enable-cors

Update docs & man files

Signed-off-by: harry zhang <resouer@163.com>
Upstream-commit: f3dd2db4ff7de1399a49af928cd3eae4fccf8764
Component: engine
 2015-03-03 11:21:19 +08:00
Alexander Morozov 2d25573473 Merge pull request #11106 from MabinGo/fix_log_info 
Fix some revision about log output
Upstream-commit: 32ccde46dde5130adcfb170c846c8f0317761aee
Component: engine
 2015-03-02 13:55:43 -08:00
moxiegirl 6a658a3da6 Merge pull request #11111 from zenlinTechnofreak/zlFixDriverNote 
fix err in note at daemon/networkdriver/bridge/driver.go
Upstream-commit: 377e62aa027337cf360f22cbf54fdec87743776f
Component: engine
 2015-03-02 12:31:37 -08:00
Jessie Frazelle c6435e1b51 Merge pull request #10986 from crosbymichael/create-api-type 
Create api types package for structured responses
Upstream-commit: 2bfa701f45b55fbfd7e5d5a1d6fa45a8d84cd19a
Component: engine
 2015-03-02 12:22:02 -08:00
Jessie Frazelle d0e86ebf79 Merge pull request #11054 from MabinGo/checkfileoper1 
Add the file close operation before function return to advoid resource leaking
Upstream-commit: 82aa950f4e10dbd45b16ecfc144f8d4b450ad1ff
Component: engine
 2015-03-02 10:44:26 -08:00
Phil Estes aeb9a73d60 Merge pull request #11083 from MabinGo/minor_typo 
Modify the minor typo in deviceset.go
Upstream-commit: 738bdec4908755761b27b7d15baeefb1a824f770
Component: engine
 2015-03-02 13:11:14 -05:00
Zen Lin(Zhinan Lin) 8ce83c8f78 fix err in note at daemon/networkdriver/bridge/driver.go 
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
Upstream-commit: e5bc50b5cd5237e820f5a708d0c351581905f1e2
Component: engine
 2015-03-03 00:52:53 +08:00
Phil Estes 8ccc0c87e2 Merge pull request #11003 from brahmaroutu/rename_10996 
Prefix / is ignored when container is renamed
Upstream-commit: 89db94ecf904bf09dbf80ca879a2b759443e2392
Component: engine
 2015-03-02 09:48:07 -05:00
Mabin 4a59461365 Fix some revision about log output 
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: adfd1ddfc6e094295d07ff2b36fb6e91cf7878dd
Component: engine
 2015-03-02 17:06:38 +08:00
Mabin f3df541809 fix typo of comments in daemon/graphdriver/devmapper/deviceset.go 
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: f4ac86de84c25bf1793d1e934695b7119dc51b70
Component: engine
 2015-03-02 02:11:15 +08:00
Lei Jitang 1f225ba7bc Fix a minor typo in daemon/container.go 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 40dc18e2fa3724c5c4361f42a413c754ee03a492
Component: engine
 2015-02-28 18:43:28 +08:00
Mabin 5e225bf426 Modify the minor typo in deviceset.go 
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: 5c1559a754f7b1fba45be01a6f1a4b3c7c6c4c68
Component: engine
 2015-02-28 18:04:10 +08:00
Srini Brahmaroutu 2b1fd26fbf Prefix / to the container name is ignored when container is renamed 
Closes #10996

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: caaae78247d9ceecba07da381401c2376b478c2b
Component: engine
 2015-02-27 22:40:04 +00:00
Jessie Frazelle 80fc2cf3da Merge pull request #11011 from coolljt0725/fix_rmi_conflict 
Fix docker remove an image show misleading conflicts
Upstream-commit: 13030add69ca84a853c036ac139f3325afc1b0e0
Component: engine
 2015-02-27 12:00:12 -08:00
Mabin 0fd505f748 Add the file close operation before function return to advoid resource leaking 
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: b5eeab6e061d183be050143426dd7fd774c89a20
Component: engine
 2015-02-28 00:24:41 +08:00
Liu Hua 394722ec93 fix a minor typo in daemon/exec.go 
Signed-off-by: Liu Hua <sdu.liu@huawei.com>
Upstream-commit: 5b794c413a147dbc06f76caa6f2c32d1f4b1f2ce
Component: engine
 2015-02-26 19:11:27 +08:00
Lei Jitang 4bec37b70e Fix docker remover an image show misleading conflicts 
due to its dependency is tagged to multiple repositories

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: d9d9175507f3ac2d43fa27bc5f0710c79cd14cfc
Component: engine
 2015-02-26 12:01:35 +08:00
Brian Goff 2e0ec2c817 Allow setting ulimits for containers 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 3f39050637d454e9ee8075153a917c8bfccb5bae
Component: engine
 2015-02-25 19:37:43 -05:00
Michael Crosby 47a091cc6c Merge pull request #10498 from ashahab-altiscale/9875-lxc-stats 
Implements stats for lxc driver
Upstream-commit: 9a2e58dd2940d11d3c8f22a0fabe54591a5e3619
Component: engine
 2015-02-25 13:46:18 -08:00
Tibor Vass de2c651b17 Merge pull request #9123 from rhatdan/commit-change 
Patch to commit-change patch to add docker import support
Upstream-commit: e7dc7a63423911430512bb5ecf693d58de459b40
Component: engine
 2015-02-24 17:09:10 -05:00
Michael Crosby c1ee38da67 Merge pull request #10935 from coolljt0725/fix_commit 
Fix docker commit make a paused container to unpaused
Upstream-commit: bd95269fb917850fcfe8951135a61eb7398bcc71
Component: engine
 2015-02-24 13:28:32 -08:00
Michael Crosby aab969a855 Move stats api types into api/types package 
Move the stats structs from the api/stats package into a new package
api/types that will contain all the api structs for docker's api request
and responses.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 7fed7d7eb4d7766d9342821f2667d160c5f958eb
Component: engine
 2015-02-24 10:47:47 -08:00
Daniel, Dao Quang Minh 22d99ec297 support changes in commit job 
In addition to config env, `commit` now will also accepts a `changes` env which
is a string contains new-line separated Dockerfile instructions.
`commit` will evaluate `changes` into `runconfig.Config` and merge it with
`config` env, and then finally commit a new image with the changed config

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: rhatdan)
Upstream-commit: b30257ccf96f646c6b008312d39544d6700f5cb1
Component: engine
 2015-02-24 13:01:35 -05:00
Abin Shahab afb7a8b8ef Restored removed docker init options 
Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
Upstream-commit: 3bd3f7854ad87420cc8779f8f44356775ae4f878
Component: engine
 2015-02-24 16:59:04 +00:00