f7b6fbbd76
Prevent dynamic allocation of previously allocated ports
...
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com> (github: kippandrew)
2014-03-18 13:30:21 -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
69299f041f
Add some documentation about relative WORKDIR values
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-17 19:42:27 -06:00
c1f492755b
Improve WORKDIR test to cover more edge cases
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-17 19:42:13 -06: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
8b159fca8a
address comments from @jamtur01
...
Docker-DCO-1.1-Signed-off-by: Andrea Turli <andrea.turli@gmail.com> (github: andreaturli)
2014-03-17 23:39:35 +01: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
782eb5f03a
add softlayer installation instructions
...
Docker-DCO-1.1-Signed-off-by: Andrea Turli <andrea.turli@gmail.com> (github: andreaturli)
2014-03-17 23:19:47 +01: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
5921b186d1
display command display in docker ps
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-17 18:36:15 +00:00
597e0812fb
Merge pull request #4645 from crosbymichael/add-logger
...
Add logger to libcontainer
2014-03-17 11:30:14 -07:00
d810218038
Merge pull request #4720 from vieux/fix_content-type_cp
...
fix content-type detection in docker cp
2014-03-17 11:24:18 -07:00
a62c7215c6
Update fedora.rst
...
It looks like ``wmdocker`` does not have an update for Fedora 20:
```
~❯ pkgwat releases wmdocker
Starting new HTTPS connection (1): apps.fedoraproject.org
+---------------+----------------+-----------------+
| release | stable_version | testing_version |
+---------------+----------------+-----------------+
| Rawhide | 1.5-12.fc21 | None |
| Fedora 20 | None | None |
| Fedora 19 | None | None |
| Fedora EPEL 7 | None | None |
| Fedora EPEL 6 | None | None |
| Fedora EPEL 5 | None | None |
+---------------+----------------+-----------------+
```
I'm not sure if the owner awjb is intending to create an F20 update or
not, but either way -- these docs are incorrect as currently written.
Docker-DCO-1.1-Signed-off-by: Ralph Bean <rbean@redhat.com> (github: ralphbean)
2014-03-17 14:18:11 -04:00
73f5aa87af
Merge pull request #4719 from philips/Capabilities-to-CapabilitiesMask
...
refactor(libcontainer): rename to CapabilitiesMask
2014-03-17 11:15:29 -07:00
ad7e7d6123
chore(libcontainer): small grammar fix in types_test
...
Someone probably got really used to typing er on the end of contain :)
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
2014-03-17 11:07:29 -07:00
128381e0f0
refactor(libcontainer): rename to CapabilitiesMask
...
The Capabilities field on libcontainer is actually used as a mask.
Rename the field so that this is more clear.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
2014-03-17 11:07:12 -07:00
a9ac35cbfb
Merge pull request #4700 from erikh/2371-sort_ports
...
In `docker ps`, sort by port instead of unsorted.
2014-03-17 11:03:06 -07:00
f68dd44dfa
Merge pull request #4686 from pnasrat/benchmark-typo
...
Fix spelling of benchmark test
2014-03-17 10:59:43 -07:00
90b283c39a
fix content-type detection in docker cp
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-17 17:56:21 +00:00
555c1ef670
Merge pull request #4672 from vieux/update_godoc_mflags
...
update godoc and add MAINTAINERS for mflags
2014-03-17 19:30:58 +02:00
Andy Kipp
Victor Vieux
Guillaume J. Charmes
James Turnbull
Viktor Vojnovski
Alexander Larsson
Sven Dowideit
Michael Crosby
Vincent Batts
Michael Crosby
Tianon Gravi
Andrea Turli
unclejack
Isabel Jimenez
Timothy Hobbs
Brian Goff
Ralph Bean
Brandon Philips