5dbfe310fe
libcontainer: remove duplicate imports
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-03-18 16:25:26 -07:00
f58757a699
libcontainer: goimports
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-03-18 16:18:34 -07:00
b10b950b11
libcontainer/nsinit/init: move mount namespace after network
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-03-18 16:18:04 -07:00
f52b2fdcbb
libcontainer/network: add netns strategy
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-03-18 16:17:28 -07:00
22c18de7be
Merge pull request #4744 from LK4D4/fix_issue_#3565
...
Using names in docker ps --since-id/--before-id, resolves #3565
2014-03-18 15:39:56 -07:00
119839dfd7
Merge pull request #4749 from cpuguy83/add_nofile_noproc_settings_to_upstart
...
Add upstart nofile/noproc similar to systemd init
2014-03-18 15:30:30 -06:00
06d87fd540
Merge pull request #4740 from vojnovski/patch-1
...
Update ubuntulinux.rst
2014-03-19 06:48:57 +10:00
e27c635c06
Add upstart nofile/noproc similar to systemd init
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-03-18 16:27:20 -04:00
c1f2abd899
Using names in docker ps --since-id/--before-id, resolves #3565
...
Also renames --since-id/--before-id to --since/--before and add errors
on non-existent containers.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-03-18 23:30:21 +04:00
bfbf338f51
Merge pull request #4684 from cpuguy83/4682-do_not_sigkill_on_docker_stop
...
Disable automatic killing of containers when docker stop fails
2014-03-18 11:28:42 -07:00
1e56ec8b67
Merge pull request #4733 from vieux/3729_time_exit
...
add time since exit in docker ps
2014-03-18 11:25:11 -07:00
c584910b55
Merge pull request #4650 from vbatts/vbatts-btrfs_build_tags
...
btrfs: build tags
2014-03-18 11:10:00 -07:00
c76def2dd2
typo
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-18 13:46:38 -04:00
29c45e7f4f
packagers: btrfs build tag docs
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-18 13:45:36 -04:00
5cfea26bcf
btrfs: build tags
...
correct filename and make the tag more readable
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-18 13:44:23 -04:00
85a62d9b77
btrfs: build tags
...
Default to the same build behavior, but allow a go build tag to disable
building of the btrfs graphdriver
go build -tags no_btrfs' ...
$ go build
$ objdump -S docker | grep btrfs | wc -l
194
$ go build -tags no_btrfs
$ objdump -S docker | grep btrfs | wc -l
1
# that is a comment ;-)
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-18 13:44:22 -04:00
f14c0866ec
Merge pull request #4674 from vbatts/vbatts-graphdriver_build_tags
...
graphdriver: build tags
2014-03-18 10:25:59 -07:00
8ac6400749
Merge pull request #4739 from alexlarsson/dm-timeout
...
devmapper: Increase timeout in waitClose to 10sec
2014-03-18 10:12:59 -07:00
98949c0793
Merge pull request #4738 from SvenDowideit/mention-env-scrubbing
...
add env hint
2014-03-18 10:32:05 -06:00
ae1dd52b19
Update ubuntulinux.rst
...
Adding the Docker repository key fails if port 11371 not open. This would probably work for more people.
2014-03-18 17:10:22 +01:00
a70beda1ec
devmapper: Increase timeout in waitClose to 10sec
...
As reported in https://github.com/dotcloud/docker/issues/4389 we're
currently seeing timeouts in waitClose on some systems. We already
bumped the timeout in waitRemove() in
https://github.com/dotcloud/docker/issues/4504 .
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-18 15:54:40 +01:00
e5cbb5c906
add env hint
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-18 22:29:11 +10:00
3782900405
Merge pull request #4731 from crosbymichael/fix-execin
...
Only unshare the mount namespace for execin
2014-03-17 18:59:26 -07:00
448b64164d
runtime: no build tags for vfs driver
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-17 21:54:43 -04:00
670ce98c60
graphdriver: build tags
...
Enable build tags for all the graphdrivers to be excludable.
As an example:
```
$ go build
$ ls -l docker
-rwxr-xr-x 1 vbatts vbatts 18400158 Mar 14 14:22 docker*
$ go build -tags "exclude_graphdriver_aufs exclude_graphdriver_vfs exclude_graphdriver_devicemapper"
$ ls -l docker
-rwxr-xr-x 1 vbatts vbatts 17467068 Mar 14 14:22 docker*
```
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-17 21:54:05 -04:00
4b1513f9c3
Only unshare the mount namespace for execin
...
Fixes #4728
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-17 18:52:56 -07:00
15a267b57d
add time since exit in docker ps
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-18 01:34:43 +00:00
68dc189680
Merge pull request #4661 from vieux/add_no_prune
...
Add no prune
2014-03-17 16:07:55 -07:00
fb503da34e
Merge pull request #4710 from jimenez/4680-timeout_flag-fix
...
Disable timeout
2014-03-18 00:38:39 +02:00
30541ade82
Merge pull request #4702 from timthelion/Issue#4681-1
...
Fix Issue#4681
2014-03-17 15:31:54 -07:00
25218f9b23
adding configuration for timeout and disable it by default
...
Docker-DCO-1.1-Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com > (github: jimenez)
2014-03-17 15:12:02 -07:00
659b719aa6
Refactor out interface specific information from execdriver.Network
...
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
2014-03-17 22:53:48 +01:00
865310e99d
Merge pull request #4689 from ralphbean/patch-1
...
Update fedora.rst
2014-03-18 07:49:48 +10:00
353df19ab7
Fix issue #4681 - No loopback interface within container when networking is disabled.
...
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Remove loopback code from veth strategy
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Looback strategy: Get rid of uneeded code in Create
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Use append when building network strategy list
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Swap loopback and veth strategies in Networks list
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Revert "Swap loopback and veth strategies in Networks list"
This reverts commit 3b8b2c8454171d79bed5e9a80165172617e92fc7.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
When initializing networks, only return from the loop if there is an error
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
2014-03-17 22:01:24 +01:00
53c5b1856d
Add failing test case for issue #4681
...
Add a failing test case for an issue where docker is not creating a loopback device if networking is dissabled.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
2014-03-17 22:01:24 +01:00
dd040c9870
Merge pull request #4723 from vieux/fix_panic_monitor
...
fix panic in monitor
2014-03-17 13:52:22 -07:00
0e92c7c24a
Merge pull request #4721 from vieux/4716-display_ps-fix
...
Fix display command display in docker ps
2014-03-17 22:04:00 +02:00
1dfc440733
fix panic in monitor
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-17 19:33:40 +00:00
326f6a4b4d
fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-17 19:17:40 +00:00
8b5cf51d60
Disable automatic killing of containers when docker stop fails
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-03-17 15:15:44 -04:00
59035d291f
Merge pull request #4678 from crosbymichael/move-runtime-deps
...
Move runtime deps
2014-03-17 12:01:09 -07:00
2bddcd68b4
Gofmt imports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-17 11:41:28 -07:00
a18d08177c
Add missing client doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-17 18:40:57 +00:00
afcaaffd0b
update doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-17 18:40:57 +00:00
edd8d2d351
add no prune to rmi
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-17 18:40:57 +00:00
96c4816cef
Move graphdrivers into runtime top level pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-17 11:40:12 -07:00
af385151ce
Move execdrivers into runtime top level pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-17 11:40:12 -07:00
2230c9b9a7
Move networking drivers into runtime top level pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-17 11:40:12 -07:00
2ada6441db
Merge pull request #4701 from erikh/4099-non_existent_file_no_error
...
Fix `docker cp` trying to untar files that do not exist.
2014-03-17 20:38:26 +02:00
f9bd6c860d
Merge pull request #4364 from vieux/move_clone
...
move git clone from daemon to client
2014-03-17 11:36:56 -07:00
Johan Euphrosine