centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-05 10:48:55 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,128 Commits 56 Branches 28 Tags
8d62e12f4dfdbe795cae1a4bf4571aae3ea6b6ea
Commit Graph

1107 Commits

Author SHA1 Message Date
Antonio Murdaca
c79b9bab54 Remove engine.Status and replace it with standard go error 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-25 22:32:08 +01:00
Arnaud Porterie
54a607a22d Merge pull request #11691 from matthewkmayer/feature-dont-create-bind-dirs 
Removes bind dir creation in daemon start.
 2015-03-25 11:44:13 -07:00
Vincent Batts
b76e300b4c btrfs: #ifdef for build version 
We removed it, because upstream removed it. But now it will be coming
back, so work with it either way.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2015-03-25 13:56:51 -04:00
Alexander Morozov
444c967aec Merge pull request #11750 from MabinGo/adjust_log_func_call 
Use appropriate func to record logs according to different scene
 2015-03-25 09:41:41 -07:00
Mabin
b46beb170f Use appropriate function to record logs 
Signed-off-by: Mabin <bin.ma@huawei.com>
 2015-03-25 23:32:12 +08:00
Anes Hasicic
e479e1c9f7 Fixed redundant else in GetDeviceStatus 
Signed-off-by: Anes Hasicic <anes.hasicic@gmail.com>
 2015-03-25 09:53: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
d214e64032 Merge pull request #11018 from delftswa2014/10958-pidfile 
Moves pid file operations to /pkg/
 2015-03-24 17:20:52 -07:00
Rick Wieman
772833274f Moved pidfile from utils to pkg 
Fixes #10958 by moving utils.daemon to pkg.pidfile.
Test cases were also added.
Updated the daemon to use the new pidfile.

Signed-off-by: Rick Wieman <git@rickw.nl>
 2015-03-24 23:59:32 +01: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
Matthew Mayer
08d75bc450 Squashed commit of the following: 
commit d379f7645026001ce57fd6421c819f6c7df77964
Author: Matthew Mayer <matthewkmayer@gmail.com>
Date:   Mon Mar 23 22:13:06 2015 -0700

    Removes unused imports.

    Signed-off-by: Matthew Mayer <matthewkmayer@gmail.com>

commit 6e1f77c7f1566c8719087d88fbe06bade122691c
Author: Matthew Mayer <matthewkmayer@gmail.com>
Date:   Mon Mar 23 20:41:16 2015 -0700

    Removes bind dir creation in daemon start.

    Signed-off-by: Matthew Mayer <matthewkmayer@gmail.com>

Signed-off-by: Matthew Mayer <matthewkmayer@gmail.com>
 2015-03-24 14:56:45 -07:00
Anton Tiurin
fc325274e8 History.Swap Use parallel assignment to swap elements, as it's 
a more idiomatic way for golang than using a temp variable.

Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
 2015-03-25 00:13:13 +03:00
Vincent Batts
8fc9e40086 Merge pull request #11417 from rhatdan/btrfs 
Btrfs has eliminated the BTRFS_BUILD_VERSION in latest version
 2015-03-24 16:00:15 -04:00
Alexander Morozov
131b29f7bc Merge pull request #10283 from rhatdan/dev 
We want to allow the sharing of /dev from the host into the container.
 2015-03-24 12:57:44 -07:00
Alexander Morozov
f7900cdd67 Merge pull request #11689 from calavera/ipallocator_refactor 
Use a structure to keep the allocated ips pool.
 2015-03-24 12:42:30 -07:00
Phil Estes
ce372cd664 Merge pull request #11709 from paulbellamy/11626-portallocator 
Refactor global portallocator and portmapper state
 2015-03-24 13:51:00 -05:00
David Calavera
7e95b13460 Use a structure to keep the allocated ips pool. 
Fixes #11624.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-03-24 11:41:44 -07:00
Dan Walsh
25c4a92342 Merge branch 'master' of github.com:docker/docker into btrfs 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-03-24 14:14:54 -04: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
Antonio Murdaca
b80fae7356 Refactor pkg/common, Fixes #11599 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-24 18:19:59 +01:00
Paul Bellamy
87df5ab41b Refactor global portallocator and portmapper state 
Continuation of: #11660, working on issue #11626.

Wrapped portmapper global state into a struct. Now portallocator and
portmapper have no global state (except configuration, and a default
instance).

Unfortunately, removing the global default instances will break
```api/server/server.go:1539```, and ```daemon/daemon.go:832```, which
both call the global portallocator directly. Fixing that would be a much
bigger change, so for now, have postponed that.

Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com>
 2015-03-24 11:15:30 +00:00
Alena Prokharchyk
dabd8a02ae Removed unused "mutex" field 
fixes #11659

Signed-off-by: Alena Prokharchyk <alena@rancher.com>
 2015-03-23 19:05:21 -07:00
Jessie Frazelle
d5eea4e8b0 Merge pull request #11636 from robertabbott/refactor_networkfs 
Refactor pkg/networkfs
 2015-03-23 16:58:29 -07:00
Anton Tiurin
f2c7b4d743 Syslog.Log - Remove redundant cast of msg.Line []byte to string as 
it's a fmt.Sprintf responsibility.

Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
 2015-03-24 01:35:54 +03:00
Jessie Frazelle
ccd4181d10 Merge pull request #11545 from cpuguy83/remove_allocator_warning 
Don't warn when ip_local_port_range not found
 2015-03-23 14:19:57 -07:00
Alexander Morozov
d852e5fde8 Merge pull request #11660 from paulbellamy/11626-portallocator 
Refactoring portallocator away from a global var
 2015-03-23 14:10:56 -07:00
Paul Bellamy
1257679876 Refactor global portallocator state into a global struct 
Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com>
 2015-03-23 20:41:41 +00:00
Brian Goff
8e4d9f3cf9 Improve err message when parsing kernel port range 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-03-23 13:29:25 -07:00
Alexander Morozov
2717302cc6 Merge pull request #11654 from runcom/11650-syslog-close-redunant-nil-check 
syslog Close() - Remove redunant nil check, s.writer cannot be nil
 2015-03-23 12:32:26 -07:00
Antonio Murdaca
e600df2d97 Remove redunant nil check, s.writer cannot be nil 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-23 20:03:24 +01:00
Antonio Murdaca
8f025aae36 Refactor syslog Log else clause 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-23 20:01:01 +01:00
Alexander Morozov
65e21f5703 Merge pull request #11458 from ibuildthecloud/syslog 
Add syslog logging driver
 2015-03-23 11:34:33 -07:00
Jessie Frazelle
1fe55b2f8b Merge pull request #10365 from cpuguy83/9981_fix_cannot_overwrite_nonbind_as_bind 
Allow path from normal volume existing to overwrite in start Binds
 2015-03-23 10:43:02 -07:00
bobby abbott
a91b2431a3 Refactor pkg/networkfs 
Solves #11591

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
 2015-03-22 23:53:47 -07:00
sidharthamani
eaecd8b1b5 add syslog driver 
Signed-off-by: wlan0 <sid@rancher.com>
 2015-03-21 18:01:18 -07:00
Jessie Frazelle
b6e20a67f9 Merge pull request #11454 from hqhq/fix_memoryswap_warning 
do not warning when we disable memoryswap
 2015-03-21 15:23:25 -07:00
Michael Crosby
84d3ab30d4 Merge pull request #11492 from coolljt0725/fix_hostname_missing_in_container_netmode 
Fix hostname missing when a container's net mode is contaienr mode
 2015-03-20 16:49:37 -07:00
Dan Walsh
3c136333af Btrfs has eliminated the BTRFS_BUILD_VERSION in latest version 
They say we should only use the BTRFS_LIB_VERSION

They will no longer support this since it had to be managed manually

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-03-20 11:43:53 -04: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
Alexander Morozov
d338c613bf Merge pull request #11459 from simonswine/10001-ipv6-tests 
[WiP] Adds testing for bridge's IPv6 support
 2015-03-19 08:37:28 -07:00
Tibor Vass
fdf49d758f Merge pull request #11274 from MabinGo/selinux_enable_verify 
Add logs when Docker enabled selinux (closes #11197)
 2015-03-19 10:34:55 -04:00
Phil Estes
9d5eab1873 Merge pull request #11453 from duglin/HideDaemonDots 
Hide dots on daemon startup when loglevel != info
 2015-03-19 10:10:18 -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