docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,008 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

226 Commits

Author SHA1 Message Date
Daniel, Dao Quang Minh 71b5a754ce remove unused utils 
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
 2015-04-22 21:53:45 +00:00
Jessie Frazelle 17d5450bc3 Merge pull request #10736 from coolljt0725/add_cpu_limit 
Add support cpu cfs_quota
 2015-04-20 17:55:01 -07:00
Lei Jitang dcc50e1d59 Add support cpu cfs quota 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-20 08:16:47 -07:00
Ma Shimiao e607bb49c4 clenaup: delete unused function getEnv 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-04-20 16:32:42 +08:00
Michael Crosby a5f7c4aa31 Ensure state is destroyed on daemont restart 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-04-15 17:44:03 -07:00
Qiang Huang 8077b2fb80 add support for cpuset.mems 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-04-15 09:33:46 +08:00
Antonio Murdaca c30a55f14d Refactor utils/utils, fixes #11923 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-14 01:37:36 +02:00
Michael Crosby 12f7db1830 Merge pull request #12025 from coolljt0725/add_exec_with_user 
Add docker exec run command as a different user and in privileged mode
 2015-04-13 13:50:51 -07:00
Evan Hazlett 05433a4dab Merge pull request #12275 from LK4D4/pid_host_hell 
Get process list after PID 1 dead
 2015-04-13 14:50:23 -04:00
Eric Windisch ca37301d54 Link to HTTPS URLs in engine comments 
Updates most of the instances of HTTP urls in the engine's
comments. Does not account for any use in the code itself,
documentation, contrib, or project files.

Signed-off-by: Eric Windisch <eric@windisch.us>
 2015-04-11 13:31:34 -04:00
Lei Jitang 72a500e9e5 Add docker exec run a command in privileged mode 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-11 11:26:37 +08:00
Lei Jitang 2cce4791b0 Add `-u|--user` flag to docker exec for running command as a different user 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-04-11 11:04:24 +08:00
Alexander Morozov ac8bd12b39 Get process list after PID 1 dead 
Fix #11087

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-10 16:23:57 -07:00
Brian Goff 6b7e520aa3 Merge pull request #12215 from ahmetalpbalkan/execdriver/localrand 
execdriver/lxc: use local rand.Random in test
 2015-04-09 12:22:25 -04:00
Yan Feng ab11d60555 Fix a typo in docker/daemon/execdriver/native/exec.go 
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
 2015-04-09 11:46:09 -04:00
Ahmet Alp Balkan c2c45d7769 execdriver/lxc: use local rand.Random in test 
Preventing the test execution to pollute the deterministic runtime environment
by seeding the global rand.Random.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-04-08 18:13:07 -07:00
Mrunal Patel 195bebd3a7 Removes unused function. 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2015-04-07 18:15:28 -04:00
guoxiuyan ffcc4a1e52 Fix a minor typo 
Signed-off-by: Guo Xiuyan <guoxiuyan@huawei.com>
 2015-04-04 15:36:35 +08:00
Michael Crosby 7061a993c5 Return closed channel if oom notification fails 
When working with Go channels you must not set it to nil or else the
channel will block forever.  It will not panic reading from a nil chan
but it blocks.  The correct way to do this is to create the channel then
close it as the correct results to the caller will be returned.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-04-01 15:30:48 -07:00
Jessie Frazelle f0ddbbaa86 Merge pull request #11933 from LK4D4/fix_err_mask 
Various fixes for execdriver
 2015-03-30 17:12:35 -07:00
Alexander Morozov f468bbb7e8 Do not mask *exec.ExitError 
Fix #11764

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-30 15:31:49 -07:00
Antonio Murdaca cc46ae8eae Remove duplicate assignment 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-30 23:07:43 +02:00
Alexander Morozov 5a1e5cf8c9 Get child processes before main process die 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-30 13:28:34 -07:00
Alexander Morozov 489ab77f4a Use proper wait function for --pid=host 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-30 13:27:38 -07:00
Antonio Murdaca 6f4d847046 Replace aliased imports of logrus, fixes #11762 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-26 23:22:04 +01:00
Jessica Frazelle 7dce902494 Get rid of panic in stats for lxc 
Fix containers dir

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
 2015-03-24 21:12:06 -07:00
Jessie Frazelle 22dba32b4d Merge pull request #10527 from mfojtik/lxc_11 
Fix lxc-start in lxc>1.1.0 where containers start daemonized by default
 2015-03-24 17:37:27 -07:00
Michael Crosby 246cab90f2 Mkdir for lxc root dir before setup of symlink 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-24 15:53:23 -07:00
Michael Crosby f3fc857e01 Merge pull request #11716 from LK4D4/root_in_run 
Use /var/run/docker as root for execdriver
 2015-03-24 14:58:30 -07:00
Alexander Morozov 1e788ec985 Use /var/run/docker as root for execdriver 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-24 10:47:30 -07:00
Dan Walsh fe9fe1473c We want to allow the sharing of /dev from the host into the 
container.

docker run -v /dev:/dev should stop mounting other default mounts in i
libcontainer otherwise directories and devices like /dev/ptx get mishandled.

We want to be able to run libvirtd for launching vms and it needs
access to the hosts /dev.  This is a key componant of OpenStack.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-03-20 08:56:21 -04:00
Jessie Frazelle 5a239c0022 Merge pull request #11507 from crosbymichael/container-state 
Cleanup libcontainer container state
 2015-03-19 16:02:24 -07:00
Michael Crosby 455a272aef Merge pull request #11428 from vishh/parent-cgroup 
Adding '--cgroup-parent' option.
 2015-03-19 14:41:57 -07:00
Michael Crosby 2b12b099b8 Mount libcontainer state dir in tmpfs 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-19 14:27:17 -07:00
Michael Crosby 06c939e527 Ensure the container state is removed on daemon boot 
This ensures that the libcontainer state is fully removed for a
container after it is terminated.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-19 14:21:19 -07:00
Mrunal Patel 60ef4ae6fc Update libcontainer to 4a72e540feb67091156b907c4700e580a99f5a9d 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2015-03-19 14:42:23 -04:00
Michal Fojtik d62f25e422 Fix lxc-start in lxc>1.1.0 where containers start daemonized by default 
Signed-off-by: Michal Fojtik <mfojtik@redhat.com>
 2015-03-19 14:51:05 +01:00
Vishnu Kannan 0b1e2b5a55 Adding '--cgroup-parent' flag to docker run. This feature helps users implement more complex 
resource isolation policies on top of what native docker provides.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2015-03-19 02:34:15 +00:00
Michael Crosby f4a458e67f Do not mask /proc/kcore in privileged 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-18 14:17:21 -07:00
Michael Crosby f5a154f2d2 Don't hardcode default rlimit 
The default for rlimit handling should be to inherit the rlimit of the
daemon unless explicitly set.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-17 16:04:15 -07:00
Jessie Frazelle 87a8658eb6 Merge pull request #11353 from mrunalp/override_default_mounts 
Filter out default mounts that are being overriden by the user.
 2015-03-16 16:40:32 -07:00
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
Michael Crosby a2fcae41ef Merge pull request #11343 from hqhq/hq_fix_panic_error 
fix panic error when docker stats a stopped container
 2015-03-16 15:16:03 -07:00
Michael Crosby 0c2eb5ebfb Merge pull request #11295 from LK4D4/oom_after_dead 
Check oom status after container stopped in lxc driver
 2015-03-16 14:16:47 -07:00
Qiang Huang 8dc5791f73 fix panic error when docker stats a stopped container 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-03-16 19:55:34 +08:00
Arnaud Porterie 82f390e139 Merge pull request #11076 from hqhq/hq_use_warning_in_sysinfo 
use type WARN for warning
 2015-03-15 21:13:23 -07:00
Qiang Huang 837eec064d move resources from Config to HostConfig 
Cgroup resources are host dependent, they should be in hostConfig.

For backward compatibility, we just copy it to hostConfig, and leave it in
Config for now, so there is no regressions, but the right way to use this
throught json is to put it in HostConfig, like:
  {
      "Hostname": "",
      ...
      "HostConfig": {
	  "CpuShares": 512,
          "Memory": 314572800,
          ...
      }
  }

As we will add CpusetMems, CpusetCpus is definitely a better name, but some
users are already using Cpuset in their http APIs, we also make it compatible.

The main idea is keep using Cpuset in Config Struct, and make it has the same
value as CpusetCpus, but not always, some scenarios:
 - Users use --cpuset in docker command, it can setup cpuset.cpus and can
   get Cpuset field from docker inspect or other http API which will get
   config info.
 - Users use --cpuset-cpus in docker command, ditto.
 - Users use Cpuset field in their http APIs, ditto.
 - Users use CpusetCpus field in their http APIs, they won't get Cpuset field
   in Config info, because by then, they should already know what happens
   to Cpuset.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-03-11 09:31:18 +08:00
Qiang Huang bffe04b582 fix warning messages 
Use log.Warnf instead of log.Infof, and remove redundant `WARNING` prefix.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-03-11 08:47:45 +08:00
Alexander Morozov d59212e605 Check oom status after container stopped in lxc driver 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-10 13:45:13 -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