2fb89b2e2c
Merge pull request #11208 from LK4D4/new_libcontainer_api
...
New libcontainer api
2015-03-10 07:50:19 -07:00
89bdaa35e0
Remove subdirectories MAINTAINERS files
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-03-06 18:21:51 -08:00
68ba5f0b69
Execdriver implementation on new libcontainer API
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-06 14:46:58 -08:00
06a40f0f28
docker info display http/https_proxy setting
...
Signed-off-by: Zhang Wentao <zhangwentao234@huawei.com>
2015-03-06 09:02:21 +08:00
92e632c84e
Merge pull request #11064 from delftswa2014/10970-treesize
...
Move directory size calculation to pkg/ (fixes #10970 )
2015-03-05 13:06:02 -08:00
4eb2fd169f
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)
2015-03-05 13:55:44 -05:00
214eae6f53
Merge pull request #11163 from duglin/RmiTest
...
Better error message for `docker rmi ''`
2015-03-05 09:49:46 -05:00
4e5ea0c875
Seems like an un-necessary if statement
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-03-04 13:24:17 -08:00
eeb36c9348
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>
2015-03-04 13:21:59 -08:00
e2b8933d21
Move directory size calculation to pkg/ ( fixes #10970 )
...
Signed-off-by: Martijn Dwars <ikben@martijndwars.nl>
2015-03-04 21:16:31 +01:00
7b3ffd5cc0
Merge pull request #10586 from resouer/10532-fix-cors-hardcode
...
Fix 10532 to change --api-enable-cors to string.
2015-03-04 18:42:20 +00:00
2380004d30
Merge pull request #10713 from swagiaal/pickup-created-resolvconf
...
Update resolv.conf in containers on file creation.
2015-03-04 10:21:36 -05:00
e2c79e2b30
Merge pull request #11155 from coolljt0725/add_xfs_magic
...
Fix docker info show unknown backing filesystem when use xfs
2015-03-04 07:59:23 -05:00
df7ba57f5f
Merge pull request #9437 from cpuguy83/set_rlimits_in_container
...
Allow setting ulimits for containers
2015-03-04 04:00:17 -08:00
dd56fa1906
Add xfs fs magic to graphdriver/driver.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-03-04 19:01:39 +08:00
2c0e027ab9
Just format some logs and notes in /daemon/networkdriver/bridge/driver.go
...
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
2015-03-03 23:39:04 +08:00
dc0a6c1f5e
Rebase & update api doc v1.18 instead
...
Signed-off-by: harry zhang <resouer@163.com>
2015-03-03 12:32:17 +08:00
f3dd2db4ff
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>
2015-03-03 11:21:19 +08:00
32ccde46dd
Merge pull request #11106 from MabinGo/fix_log_info
...
Fix some revision about log output
2015-03-02 13:55:43 -08:00
377e62aa02
Merge pull request #11111 from zenlinTechnofreak/zlFixDriverNote
...
fix err in note at daemon/networkdriver/bridge/driver.go
2015-03-02 12:31:37 -08:00
2bfa701f45
Merge pull request #10986 from crosbymichael/create-api-type
...
Create api types package for structured responses
2015-03-02 12:22:02 -08:00
82aa950f4e
Merge pull request #11054 from MabinGo/checkfileoper1
...
Add the file close operation before function return to advoid resource leaking
2015-03-02 10:44:26 -08:00
738bdec490
Merge pull request #11083 from MabinGo/minor_typo
...
Modify the minor typo in deviceset.go
2015-03-02 13:11:14 -05:00
e5bc50b5cd
fix err in note at daemon/networkdriver/bridge/driver.go
...
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
2015-03-03 00:52:53 +08:00
89db94ecf9
Merge pull request #11003 from brahmaroutu/rename_10996
...
Prefix / is ignored when container is renamed
2015-03-02 09:48:07 -05:00
adfd1ddfc6
Fix some revision about log output
...
Signed-off-by: Mabin <bin.ma@huawei.com>
2015-03-02 17:06:38 +08:00
f4ac86de84
fix typo of comments in daemon/graphdriver/devmapper/deviceset.go
...
Signed-off-by: Mabin <bin.ma@huawei.com>
2015-03-02 02:11:15 +08:00
40dc18e2fa
Fix a minor typo in daemon/container.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-02-28 18:43:28 +08:00
5c1559a754
Modify the minor typo in deviceset.go
...
Signed-off-by: Mabin <bin.ma@huawei.com>
2015-02-28 18:04:10 +08:00
caaae78247
Prefix / to the container name is ignored when container is renamed
...
Closes #10996
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-02-27 22:40:04 +00:00
13030add69
Merge pull request #11011 from coolljt0725/fix_rmi_conflict
...
Fix docker remove an image show misleading conflicts
2015-02-27 12:00:12 -08:00
b5eeab6e06
Add the file close operation before function return to advoid resource leaking
...
Signed-off-by: Mabin <bin.ma@huawei.com>
2015-02-28 00:24:41 +08:00
5b794c413a
fix a minor typo in daemon/exec.go
...
Signed-off-by: Liu Hua <sdu.liu@huawei.com>
2015-02-26 19:11:27 +08:00
d9d9175507
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>
2015-02-26 12:01:35 +08:00
3f39050637
Allow setting ulimits for containers
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-02-25 19:37:43 -05:00
9a2e58dd29
Merge pull request #10498 from ashahab-altiscale/9875-lxc-stats
...
Implements stats for lxc driver
2015-02-25 13:46:18 -08:00
e7dc7a6342
Merge pull request #9123 from rhatdan/commit-change
...
Patch to commit-change patch to add docker import support
2015-02-24 17:09:10 -05:00
bd95269fb9
Merge pull request #10935 from coolljt0725/fix_commit
...
Fix docker commit make a paused container to unpaused
2015-02-24 13:28:32 -08:00
7fed7d7eb4
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>
2015-02-24 10:47:47 -08:00
b30257ccf9
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)
2015-02-24 13:01:35 -05:00
3bd3f7854a
Restored removed docker init options
...
Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
2015-02-24 16:59:04 +00:00
d96e885314
Fixed bad handling of "container not found" error
...
Create container job could fail because a container specified with
`--volumes-from` does not exist. This error is not propagated to client
though. Instead it's recognized by higher levels as "image not found".
Client then tries to pull the image and launch the container again.
This patch changes the lower level error message so that it's not
recognized as "image not found" and thus it's propagated to client.
Signed-off-by: Michal Minar <miminar@redhat.com>
2015-02-24 15:52:47 +01:00
7c7c7f84dc
Fix docker commit make a paused container to unpaused. Closes #10932
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-02-24 03:28:40 -08:00
8f3ecf8779
Merge pull request #10925 from brahmaroutu/pkgdependency_10922
...
Removing dependencies from pkg into Docker internal code
2015-02-23 14:49:19 -08:00
ae9001fbdc
Merge pull request #10926 from cpuguy83/10685_check_nil_volume
...
Check nil volume on mount init
2015-02-23 13:55:38 -08:00
7a9c944b82
Removing dependencies from pkg into Docker internal code
...
Closes #10922
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-02-23 18:43:10 +00:00
ba93f8316c
Rename Destroy to Rm to be consistent with CLI.
...
Signed-off-by: Rik Nijessen <riknijessen@gmail.com>
2015-02-23 16:15:56 +01:00
1a26ed09ee
Implements stats for lxc driver
...
Implements stats and fixes stats test.
Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
2015-02-23 10:16:52 +00:00
7122b6643e
Check nil volume on mount init
...
Fixes #10685 panic in some cases.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-02-21 07:21:57 -05:00
11c7c9710a
Update resolve.conf in containers on file creation.
...
NetworkManager updates resolve.conf by replacing the current file
with an updated one. This change enables docker to listen for these
events.
Signed-off-by: Sami Wagiaalla <swagiaal@redhat.com>
2015-02-20 11:27:08 -05:00
Jessie Frazelle
Arnaud Porterie
Alexander Morozov
Zhang Wentao
Michael Crosby
Dan Walsh
Phil Estes
Sven Dowideit
Doug Davis
Martijn Dwars
Lei Jitang
Zen Lin(Zhinan Lin)
resouer
resouer
Alexander Morozov
moxiegirl
Mabin
Srini Brahmaroutu
Liu Hua
Brian Goff
Tibor Vass
Michael Crosby
Daniel, Dao Quang Minh
Abin Shahab
Michal Minar
Rik Nijessen
Sami Wagiaalla