clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-28 00:50:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,459 Commits 9 Branches 112 Tags
82aa950f4e10dbd45b16ecfc144f8d4b450ad1ff
Commit Graph
968 Commits
Author SHA1 Message Date
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
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 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
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
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
Abin Shahab 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
Michal Minar 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
Lei Jitang 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
Jessie Frazelle 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
Jessie Frazelle 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
Srini Brahmaroutu 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
Rik Nijessen 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
Abin Shahab 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
Brian Goff 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
Srini Brahmaroutu 6871b9b16a Removing -X flag option and autogenerated code to create Dockerversion.go functionality 
Addresses #9207

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-02-20 05:40:12 +00:00
Steve Francia 356fe89d24 Merge pull request #10818 from estesp/link-add-aliases 2015-02-19 17:22:53 -05:00
Phil Estes 16aa64dc82 Add linked container's name and hostname as aliases to /etc/hosts 
Currently when containers are linked the alias name (e.g. from `--link
name:alias`) is added to the parent container's `/etc/hosts` with a
reference to the IP of the linked container.  Some software requires
using the official hostname or node name in operations that need to
match on those values, and it is therefore helpful if the parent
container can refer to the child/link using those same values and still
access the same IP.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-02-19 14:19:38 -08:00
Jessie Frazelle dc37358d8c Merge pull request #10619 from bcicen/add-logpath-to-inspect-container 
Add logpath to inspect container
 2015-02-19 12:56:45 -08:00
Alexander Morozov e995670935 Fix possible panic on killing container 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-02-18 11:27:38 -08:00
Bradley Cicenas 06c01b02f5 add logpath to docker inspect. 
Signed-off-by: Bradley Cicenas <bradley.cicenas@gmail.com>
 2015-02-18 10:19:52 -05:00
Jessie Frazelle 3ddef31793 Merge pull request #10780 from estesp/test-bogus-link 
Fix daemon.Get() error handling with --link setup. Add test.
 2015-02-16 11:22:21 -08:00
Phil Estes 6217f2944f Fix daemon.Get error handling with --link setup. Add test. 
Fixes newly introduced error flow from daemon.Get() in the link setup
code.  Also added more detail to daemon.Get() comments for clarity.
Added test to test the bogus container link codepath.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-02-13 15:14:38 -05:00
Lei Jitang fa228d8cbc Fix create volume /etc cover /etc/{hosts,resolv.conf,hostname} 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-02-12 08:46:53 +08:00
Vincent Batts f4dc496d36 Merge pull request #10474 from petervo/10473-availble-space 
Add available space to devicemapper status output
 2015-02-10 16:32:51 +01:00
Peter Volpe 6816d27591 Detail available space behavior on loop devices 
Signed-off-by: Peter Volpe <petervo@redhat.com>
 2015-02-09 14:51:48 -08:00
Vincent Batts 67a4f1db10 Merge pull request #10440 from rhvgoyal/skip-dot-prefix-files 
devicemapper: Skip the files with prefix "." during device map construct...
 2015-02-09 10:26:27 +01:00
Aidan Hobson Sayers 06ea5fe979 Move daemon-only flags into the daemon config struct 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2015-02-08 12:56:18 +00:00
Tibor Vass b0ed2da441 Merge pull request #10112 from cpuguy83/4393_fix_volume_where_file_exists 
Error out if file in container at volume path
 2015-02-06 19:39:48 -05:00
Tibor Vass 414a37f90a Merge pull request #10534 from unclejack/aufs_enable_dio 
daemon/graphdriver/aufs: enable direct io
 2015-02-06 18:26:09 -05:00
Jessie Frazelle 271a073a04 Merge pull request #10622 from estesp/10618-err-ondup-bind-vols 
Don't allow duplicate `-v` specifications for the same target
 2015-02-06 15:03:56 -08:00
Brian Goff c73e3bf4dc Error out if file in container at volume path 
Fixes #4393

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-02-06 18:00:00 -05:00
Jessie Frazelle 76bf543fea Merge pull request #10556 from estesp/ipv6-extra-hosts 
Allow IPv6 addresses in ExtraHosts option settings
 2015-02-06 14:53:54 -08:00
Michael Crosby e345fe53ba Merge pull request #10573 from LK4D4/return_attach_to_builder 
Change verbose builder out back to attach
 2015-02-06 14:37:09 -08:00
Michael Crosby e4a49ae188 Merge pull request #10424 from LK4D4/fix_non_tailed_log_format 
Fix logs, so now, old and followed logs has same format without []
 2015-02-06 14:35:45 -08:00
Michael Crosby 9d140fe693 Merge pull request #10105 from LK4D4/remove_tons_of_names 
Use graphdb.Walk with depth=1 in /containers
 2015-02-06 14:33:26 -08:00
Michael Crosby ffc499dbab Merge pull request #10215 from taohu/remove-assumption-first-ip-is-bridge-ip 
Remove the assumption that the first IP is the bridge IP
 2015-02-06 14:15:46 -08:00
Alexander Morozov 6efecb7b41 Merge pull request #10186 from rhatdan/selinux-build 
Turn on Security opts including labeling for docker build
 2015-02-06 14:11:21 -08:00
Alexander Morozov 10c3d9f80f Use graphdb.Walk with depth=1 in /containers 
I don't think that it was very useful feature in current implementation,
but when you have a lot of links - your daemon became unusable because
on first call of /containers global graphdb lock will be acquired and it
can take a lot of time: 30m for 15 containers linked to each other.

Links names can be seen with `--no-trunc`, but I think it's useless :)

Fixes #9967

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-02-06 14:04:21 -08:00
Michael Crosby 34c804a139 Merge pull request #9705 from acbodine/9311-truncindex-error-duplicate-id-on-ambiguous-id 
Closes #9311 Handles container id/name collisions against daemon functionalities according to #8069
 2015-02-06 14:01:28 -08:00
Phil Estes d1f33d12d4 Don't allow duplicate -v specifications for the same target 
Addresses: #10618

Given that the user has no notification that they tried to bind mount
different directories on the same target in the container, this errors
out in that case, without changing the current code allowing for
--volumes-from to trump -v/VOLUME specifications.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-02-06 17:00:53 -05:00