clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-04 07:48:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,682 Commits 9 Branches 112 Tags
7804cd36eec45c184dcabdbcb52033c1c0179c03
Commit Graph
1004 Commits
Author SHA1 Message Date
Mrunal Patel 7804cd36ee Filter out default mounts that are override by user. 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2015-03-16 18:39:50 -04:00
Jessie Frazelle c6321931d2 Merge pull request #11326 from cpuguy83/11315_rename_w_daemon_restart 
Persist container to disk after rename
 2015-03-11 13:44:13 -07:00
Brian Goff c5c72cf151 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>
 2015-03-11 12:39:31 -07:00
moxiegirl d010bf0d99 Merge pull request #11291 from ahmetalpbalkan/info/system-date 
Add system time to /info
 2015-03-11 09:43:43 -07:00
Deng Guangxing ce1a0b612d Fix minor typo 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
 2015-03-11 11:13:39 +08:00
Ahmet Alp Balkan 2977fd2b7a 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>
 2015-03-10 15:29:05 -07:00
Jessie Frazelle e4b753c1de Merge pull request #11211 from cpuguy83/ensure_engine_shutdown 
Ensure clean engine shutdown on startup errors
 2015-03-10 12:13:35 -07:00
Alexander Morozov 821ec8334f Setup user groups in lxc driver 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-10 09:43:11 -07:00
Alexander Morozov c8c11bfc36 Use CgroupString instead of missing GetCgroupAllowString in lxc_template 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-10 08:50:03 -07:00
Jessie Frazelle 2fb89b2e2c Merge pull request #11208 from LK4D4/new_libcontainer_api 
New libcontainer api
 2015-03-10 07:50:19 -07:00
Brian Goff 0e3f2f2ac0 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>
 2015-03-09 08:40:38 -04:00
Arnaud Porterie 89bdaa35e0 Remove subdirectories MAINTAINERS files 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-03-06 18:21:51 -08:00
Alexander Morozov 68ba5f0b69 Execdriver implementation on new libcontainer API 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-06 14:46:58 -08:00
Zhang Wentao 06a40f0f28 docker info display http/https_proxy setting 
Signed-off-by: Zhang Wentao <zhangwentao234@huawei.com>
 2015-03-06 09:02:21 +08:00
Michael Crosby 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
Dan Walsh 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
Phil Estes 214eae6f53 Merge pull request #11163 from duglin/RmiTest 
Better error message for `docker rmi ''`
 2015-03-05 09:49:46 -05:00
Sven Dowideit 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
Doug Davis 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
Martijn Dwars 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
Jessie Frazelle 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
Phil Estes 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
Phil Estes 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
Jessie Frazelle df7ba57f5f Merge pull request #9437 from cpuguy83/set_rlimits_in_container 
Allow setting ulimits for containers
 2015-03-04 04:00:17 -08:00
Lei Jitang 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
Zen Lin(Zhinan Lin) 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
resouer dc0a6c1f5e Rebase & update api doc v1.18 instead 
Signed-off-by: harry zhang <resouer@163.com>
 2015-03-03 12:32:17 +08:00
resouer 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
Alexander Morozov 32ccde46dd Merge pull request #11106 from MabinGo/fix_log_info 
Fix some revision about log output
 2015-03-02 13:55:43 -08:00
moxiegirl 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
Jessie Frazelle 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
Jessie Frazelle 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
Phil Estes 738bdec490 Merge pull request #11083 from MabinGo/minor_typo 
Modify the minor typo in deviceset.go
 2015-03-02 13:11:14 -05:00
Zen Lin(Zhinan Lin) 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
Phil Estes 89db94ecf9 Merge pull request #11003 from brahmaroutu/rename_10996 
Prefix / is ignored when container is renamed
 2015-03-02 09:48:07 -05:00
Mabin adfd1ddfc6 Fix some revision about log output 
Signed-off-by: Mabin <bin.ma@huawei.com>
 2015-03-02 17:06:38 +08:00
Mabin 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
Lei Jitang 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
Mabin 5c1559a754 Modify the minor typo in deviceset.go 
Signed-off-by: Mabin <bin.ma@huawei.com>
 2015-02-28 18:04:10 +08:00
Srini Brahmaroutu 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
Jessie Frazelle 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
Mabin 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
Liu Hua 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
Lei Jitang 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
Brian Goff 3f39050637 Allow setting ulimits for containers 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-02-25 19:37:43 -05:00
Michael Crosby 9a2e58dd29 Merge pull request #10498 from ashahab-altiscale/9875-lxc-stats 
Implements stats for lxc driver
 2015-02-25 13:46:18 -08:00
Tibor Vass 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
Michael Crosby 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
Michael Crosby 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
Daniel, Dao Quang Minh 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