0ef637722f
Merge pull request #6097 from timthelion/consistentdevices
...
Refactor device handling code
2014-05-31 03:34:52 +03:00
efb4ebcfe8
Merge pull request #6127 from unclejack/reuse_timestamp
...
reuse timestamp, don't call time.Now() 3 times
2014-05-30 17:21:19 -07:00
b64209f7b6
reuse timestamp, don't call time.Now() 3 times
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-05-31 03:03:51 +03:00
8ac516094e
Merge pull request #5947 from glebfm/fix-socket-race-condition
...
Fix race condition during socket creation
2014-05-30 15:07:06 -07:00
b46449cb33
Merge pull request #6123 from vieux/no_number_default
...
no default default number in names
2014-05-31 00:55:11 +03:00
0f40cedc23
Merge pull request #6124 from vieux/standadize_debug_iptables
...
use stderr to debug iptables
2014-05-31 00:46:28 +03:00
c90faa47b6
Merge pull request #6065 from vieux/fix_race_waitlock
...
update container's state after we close the waitLock
2014-05-31 00:38:35 +03:00
5708aa62f3
use stderr to debug iptables
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-30 19:39:42 +00:00
608702b980
Refactor device handling code
...
We now have one place that keeps track of (most) devices that are allowed and created within the container. That place is pkg/libcontainer/devices/devices.go
This fixes several inconsistencies between which devices were created in the lxc backend and the native backend. It also fixes inconsistencies between wich devices were created and which were allowed. For example, /dev/full was being created but it was not allowed within the cgroup. It also declares the file modes and permissions of the default devices, rather than copying them from the host. This is in line with docker's philosphy of not being host dependent.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion )
2014-05-30 19:21:29 +00:00
e70a5ab014
no default default number in names
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-30 19:08:21 +00:00
251de0887b
Merge pull request #6121 from unclejack/refactor_daemon_restore
...
optimize restore & use Getenv less in daemon.go
2014-05-30 11:37:12 -07:00
0fd0deb75d
optimize restore & use Getenv less in daemon.go
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-05-30 21:20:27 +03:00
ba1c0f4c81
Documented special case of container memory limits in manpages
...
If a container is started with a memory limit of 0, no memory limit is applied.
To prevent this from causing confusion, make interaction explicit in docs.
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
2014-05-30 13:55:13 -04:00
9e58a77e26
Merge pull request #6118 from LK4D4/fix_race_conditions
...
Fix race conditions
2014-05-30 10:43:56 -07:00
adb639117b
Atomically increment sequence in pkg/netlink
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-05-30 16:08:29 +04:00
af17b01ad7
Goroutine-safe daemon.containers
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-05-30 16:08:06 +04:00
64bd6a6a53
Fix race in native driver on activeContainers usage
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-05-30 14:16:00 +04:00
4e5f6951f2
Fix races in set/get currentInterfaces in networkdriver
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-05-30 14:16:00 +04:00
ce9e9ff4a1
Fix race on shutting down
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-05-30 14:15:46 +04:00
c4990ab999
Fix races on TagStore accessing
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-05-30 13:36:14 +04:00
838d6a9e9b
Merge pull request #5855 from philips/remove-dead-code
...
chore(graph/graph): remove dead code
2014-05-30 04:51:12 +03:00
23dd221e52
sync the initial docs from b2d
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-05-30 11:16:38 +10:00
107cd5dd5f
Merge pull request #6109 from unclejack/block_aufs_on_top_of_btrfs
...
block aufs on incompatible file systems
2014-05-29 16:58:30 -07:00
e8a87120d4
block aufs on incompatible file systems
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-05-30 02:32:27 +03:00
a86975f29b
Merge pull request #6048 from crquan/use-timeout-conn
...
Use Timeout Conn wrapper to set read deadline for downloading layer
2014-05-29 15:23:21 -07:00
887ab77922
Merge pull request #6096 from vishh/stats_strongtype
...
Replaced fs.Stats() interface with fs.GetStats() which returns a cgroups.Stats strong type
2014-05-29 15:23:01 -07:00
72e6e5ff7e
Added a new method cgroups.GetStats() which will return a cgroups.Stats object which will contain all the available cgroup Stats.
...
Remove old Stats interface in libcontainers cgroups package.
Changed Stats to use unit64 instead of int64 to prevent integer overflow issues.
Updated unit tests.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-05-29 20:16:49 +00:00
189c600b3b
Merge pull request #6105 from gdm85/master
...
Do not consider iptables' output an error in case of xtables lock
2014-05-29 11:06:25 -07:00
e2935f9c16
Merge pull request #6106 from discordianfish/improve-error-btrfs-on-non-btrfs
...
Add ErrPrerequisites to improve misleading errors
2014-05-29 11:00:13 -07:00
f65f1660c0
Merge pull request #6098 from crosbymichael/retry-mount
...
Handle EBUSY on remount
2014-05-29 09:18:54 -07:00
75754e69f6
Add ErrPrerequisites to improve misleading errors
...
There are two cases where we can't use a graphdriver:
1) the graphdriver itself isn't supported by the system
2) the graphdriver is supported by some configuration/prerequisites are
missing
This introduces a new error for the 2) case and uses it when trying to
run docker with btrfs backend on a non-btrfs filesystem.
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org> (github: discordianfish)
2014-05-29 17:09:55 +02:00
5e3b643ce6
* do not consider iptables' output an error in case of xtables lock
...
Docker-DCO-1.1-Signed-off-by: Giuseppe Mazzotta <gdm85@users.noreply.github.com> (github: gdm85)
2014-05-29 15:57:29 +02:00
8622641b58
Merge pull request #6100 from SvenDowideit/pr_out_docs_installation_google_update_to_use_container_vm_images
...
docs/installation/google: update to use container-vm images
2014-05-29 11:41:43 +10:00
456ba11d89
docs/installation/google: update to use container-vm images
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
rebased by
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-05-29 11:36:28 +10:00
b9619bf957
Merge pull request #6099 from SvenDowideit/pr_out_updated_documentation_for_mentioning_images_vs_containers
...
updated documentation for mentioning images vs containers
2014-05-29 11:23:53 +10:00
a0505edc9a
updated documentation for mentioning images vs containers
...
Docker-DCO-1.1-Signed-off-by: Robin Speekenbrink <robin@kingsquare.nl> (github: fruitl00p)
rebased by
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-05-29 11:20:41 +10:00
5d04b9deaf
Handle EBUSY on remount
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-05-28 18:10:50 -07:00
b204b97c9a
Merge pull request #6083 from bernerdschaefer/nsinit-drop-capabilities-after-changing-user
...
SETUID/SETGID not required for changing user
2014-05-28 17:29:17 -07:00
341a2b85be
Merge pull request #5402 from SvenDowideit/dont-update-authors
...
Don't add yourself to the AUTHORs file - its generated
2014-05-29 02:00:29 +03:00
745445ebb7
Merge pull request #6067 from SvenDowideit/go-fmt-s
...
gofmt does not result in the same thing as go fmt -s, which is what travis uses
2014-05-29 01:58:03 +03:00
a8131c7354
Merge pull request #6090 from alexlarsson/fix-console
...
Fix /dev/console
2014-05-29 01:09:33 +03:00
180c2a6785
add support for COPY to docker build
...
This adds a COPY command to docker build which works like ADD, but is
only for local files and it doesn't extract files.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-05-29 00:07:52 +03:00
7f5cd76824
libcontainer: Don't create a device node on /dev/console to bind mount on
...
There is no need for this, the device node by itself doesn't work, since
its not on a devpts fs, and we can just a regular file to bind mount over.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-05-28 21:07:40 +02:00
35d08bdd01
Revert "Remove the bind mount for dev/console which override the mknod/label"
...
This reverts commit ae85dd5458
2014-05-28 21:07:27 +02:00
2330be2adc
Merge pull request #6076 from LK4D4/remove_collections_package
...
Remove collections package
2014-05-28 21:32:27 +03:00
5e2af07137
Merge pull request #5868 from jhspaybar/5749-libcontainerroutes
...
libcontainer support for arbitrary route table entries
2014-05-28 10:50:56 -07:00
bf7f360dca
Fixes #5749
...
libcontainer support for arbitrary route table entries
Docker-DCO-1.1-Signed-off-by: William Thurston <me@williamthurston.com> (github: jhspaybar)
2014-05-28 17:42:02 +00:00
50417f6abc
Change 'Uploading context' wording
...
Docker-DCO-1.1-Signed-off-by: Ryan Stelly <ryan.stelly@live.com> (github: FLGMwt)
2014-05-28 11:59:29 -05:00
0563453b91
SETUID/SETGID not required for changing user
...
It is no longer necessary to pass "SETUID" or "SETGID" capabilities to
the container when a "user" is specified in the config.
Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com> (github: bernerdschaefer)
2014-05-28 16:41:48 +02:00
fd58524f81
Add system.SetKeepCaps and system.ClearKeepCaps
...
Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com> (github: bernerdschaefer)
2014-05-28 16:40:36 +02:00
unclejack
Michael Crosby
unclejack
Victor Vieux
Timothy Hobbs
Matt Heon
Alexandr Morozov
SvenDowideit
Vishnu Kannan
Victor Marmol
Johannes 'fish' Ziemke
Giuseppe Mazzotta
Sven Dowideit
Johan Euphrosine
Robin Speekenbrink
Michael Crosby
Victor Vieux
Alexander Larsson
William Thurston
FLGMwt
Bernerd Schaefer