1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
31adcc96d0 Merge pull request #19682 from aaronlehmann/transfer-release-race
Fix watching a released transfer
2016-01-25 15:37:47 -08:00
Aanand Prasad
e566a4dc1c Implement network_mode in v2
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-25 23:24:55 +00:00
Aanand Prasad
a267d8fe3c Merge pull request #2728 from shin-/2709_service_volumes
Match named volumes in service definitions with declared volumes
2016-01-25 23:24:09 +00:00
Ying Li
a1aa4d7078 Attempt to simplify pushing to codecov, since codecov can do merges.
Signed-off-by: Ying Li <ying.li@docker.com>
2016-01-25 15:18:24 -08:00
Tibor Vass
f7abff4f81 Merge pull request #19560 from aboch/mn
Reject multiple networks on container creation request
2016-01-25 14:57:51 -08:00
Tianon Gravi
722fac7a73 Change the way we install from backports in the deb builder (to force deps too)
Also, add "libsystemd-journal-dev" to the explicit list (which is what prompted the change in how we install).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-01-25 14:49:05 -08:00
Antonio Murdaca
0f0c35960f Merge pull request #19674 from tonistiigi/19652-fix-create-error-message
Fix error message in container creation
2016-01-25 23:47:57 +01:00
David Calavera
cf44f17258 Merge pull request #19619 from WeiZhang555/test-bottleneck-oomtrue
Optimize TestEventsOOMDisableTrue
2016-01-25 14:24:46 -08:00
Sebastiaan van Stijn
156e2f0e5c Merge pull request #19555 from hypriot/update-registry-on-dockerfile-armhf
Update registry version in Dockerfile.armhf
2016-01-25 14:14:00 -08:00
Nathan LeClaire
2193bd70f4 Merge pull request #2919 from ack/patch-1
Add CLC to available drivers
2016-01-25 13:59:30 -08:00
Nathan LeClaire
18509f5ec4 Merge pull request #2875 from dgageot/bats-in-go
Write CLI integration tests with Go
2016-01-25 13:57:33 -08:00
Joffrey F
af6b18cad8 Merge pull request #2746 from aanand/alias-containers-by-short-id
Alias containers by short id
2016-01-25 13:55:30 -08:00
Tibor Vass
268a20af95 Merge pull request #19528 from cpuguy83/19475_abck_compat_for_vol_drivers
Add back compat for volume drivers `Get` and `Ls`
2016-01-25 13:53:51 -08:00
Alessandro Boch
733245b2e7 Save endpoint config only if endpoint creation succeeds
- Currently it is being save upfront...

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-25 13:43:32 -08:00
Ying Li
b51d1e8cf8 Root is always on disk unless restored from backup.
(In which case if Yubikey is available, it will only be on the Yubikey and not on disk.)

Signed-off-by: Ying Li <ying.li@docker.com>
2016-01-25 13:37:39 -08:00
albert
cff41ab15b Update AVAILABLE_DRIVER_PLUGINS.md
Signed-off-by: Albert Choi <albert.choi@gmail.com>
2016-01-25 13:35:33 -08:00
Aaron Lehmann
3e2b50ccaa Fix watching a released transfer
Things could go wrong if Watch was called after the last existing
watcher was released. The call to Watch would succeed even though it was
not really adding a watcher, and the corresponding call to Release would
close hasWatchers a second time.

The fix for this is twofold:

1. We allow transfers to gain new watchers after the watcher count has
touched zero. This means that the channel returned by Released should
not be closed until all watchers have been released AND the transfer is
no longer tracked by the transfer manager, meaning it won't be possible
for additional calls to Watch to race with closing the channel returned
by Released.

The Transfer interface has a new method called Close so the transfer can
know when the transfer manager no longer references it.

Remove the Cancel method. It's not used and should not be exported.

2. Even though (1) makes it possible to add watchers after all the
previous watchers have been released, we want to avoid doing this in
practice. A transfer that has had all its watchers released is in the
process of being cancelled, and attaching to one of these will never be
the correct behavior. Add a check if a watcher is attaching to a
cancelled transfer.  In this case, wait for the transfer to be removed
from the map and try again. This will ensure correct behavior when a
watcher tries to attach during the race window.

Either (1) or (2) should be sufficient to fix the race involved here,
but the combination is the most correct approach. (1) fixes the
low-level plumbing to be resilient to the race condition, and (2) avoids
using it in a racy way.

Fixes #19606

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-25 13:28:02 -08:00
David Calavera
1431b623a4 Make volume dangling filter return only used volumes with dangling=false.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-25 16:26:51 -05:00
Madhu Venugopal
6ac9a2f410 Vendor libnetwork v0.6.0-rc3
- Fixes docker/docker#19576
- Fixed embedded DNS to listen in TCP as well
- Fixed a race-condition in IPAM to choose non-overlapping subnet for concurrent requests

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-25 13:22:47 -08:00
David Gageot
b9d470f975 Merge pull request #2911 from daehyeok/return_vboxlog
return last vbox log instead of error state code
2016-01-25 21:59:06 +01:00
Brian Goff
dd7d1c8a02 On container rm, don't remove named mountpoints
This makes it so when calling `docker run --rm`, or `docker rm -v`, only
volumes specified without a name, e.g. `docker run -v /foo` instead of
`docker run -v awesome:/foo` are removed.

Note that all volumes are named, some are named by the user, some get a
generated name. This is specifically about how the volume was specified
on `run`, assuming that if the user specified it with a name they expect
it to persist after the container is cleaned up.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-25 15:51:28 -05:00
Alessandro Boch
cfa515fd9d Reject multiple networks on container creation
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-25 12:50:01 -08:00
Brian Goff
0eed34755e Fix removing mountpoints on container rm fail
Ensure that the the container's mountpoints are cleaned up if the
container is force removed.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-25 15:49:56 -05:00
Daehyeok Mun
24eab71d4c retutn last vbox log instead of error state code
return last line in the vbox log file instead of error state code when
virtualbox vm start faile

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
2016-01-25 13:22:19 -07:00
Olivier Gambier
323fadd931 Merge pull request #2884 from hypriot/introduce-appveyor
Add appveyor.yml for native windows tests
2016-01-25 11:56:39 -08:00
Tonis Tiigi
8a68315c38 Fix error message in container creation
Error message was different if image was specified with the full ID.

Fixes #19652

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-01-25 11:45:20 -08:00
David Calavera
15cc67b73d Merge pull request #19615 from runcom/add-registry-with-auth-testsuite
integration-cli: add suite for testing registries with auth
2016-01-25 11:12:16 -08:00
Brian Goff
997e61add9 Merge pull request #19658 from wenchma/19425-daemon_ipv6
Optimize slow bottleneck tests of TestDaemonIPv6FixedCIDR
2016-01-25 14:04:54 -05:00
David Calavera
7e1b0ea5d7 Merge pull request #19629 from thaJeztah/fix-api-order
Fix remove API order in menu
2016-01-25 11:02:24 -08:00
Tobias Munk
5fe0b57e5c fixed documentation about traversing yml files
Signed-off-by: Tobias Munk <schmunk@usrbin.de>
2016-01-25 19:33:39 +01:00
Riyaz Faizullabhoy
20648f18e9 Merge pull request #497 from HuKeping/work-branch
Tiny refactor
2016-01-25 09:21:06 -08:00
Brian Goff
d02ed72e30 Merge pull request #19666 from jfrazelle/19620-fix-url
add trailing slash
2016-01-25 12:12:47 -05:00
Brian Goff
48d7cbea55 Merge pull request #19663 from mountkin/speedup-TestDaemonRestartWithContainerRunning
speed up DockerDaemonSuite.TestDaemonRestartWithContainerRunning
2016-01-25 12:08:24 -05:00
Jean-Laurent de Morlhon
3255a90d0c Merge pull request #2912 from moxiegirl/new-navigation
New navigation for 1.10 Release
2016-01-25 18:04:50 +01:00
Jessica Frazelle
0f379fab31 add trailing slash
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-25 09:01:46 -08:00
Mary Anthony
338a987699 New navigation for 1.10 Release
Removing unneeded processing script

Signed-off-by: Mary Anthony <mary@docker.com>
2016-01-25 08:42:39 -08:00
Aanand Prasad
313c584185 Alias containers by short id
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-25 16:14:21 +00:00
Zhang Wei
6bf5b3db9a Optimize slow integration test
Optimize `TestEventsOOMDisableTrue` performance

It's part of #19425 issue.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-01-26 00:07:20 +08:00
Shijiang Wei
c983996e0b speed up DockerDaemonSuite.TestDaemonRestartWithContainerRunning
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-01-25 23:45:13 +08:00
Wen Cheng Ma
73849a5c82 Optimize slow bottleneck tests of TestDaemonIPv6FixedCIDR and TestDaemonIPv6FixedCIDRAndMac
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-25 23:43:49 +08:00
David Gageot
9e83c68f1b Merge pull request #2917 from jeanlaurent/FIX-2860
Fix #2860
2016-01-25 16:41:50 +01:00
David Gageot
5d95524be6 Write CLI integration tests with Go
Signed-off-by: David Gageot <david@gageot.net>
2016-01-25 16:23:53 +01:00
Jean-Laurent de Morlhon
9de45af808 Fix #2860
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2016-01-25 16:17:44 +01:00
Stefan Scherer
8d928c7f20 Add appveyor.yml for native windows tests
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-01-25 16:13:27 +01:00
Jean-Laurent de Morlhon
dd3b66e3b6 Merge pull request #2916 from dgageot/vbox-logs
Add more logs, specially for windows users
2016-01-25 15:52:15 +01:00
Harald Albers
73a0d83075 Fix computation of service list in bash completion
The previous approach assumed that the service list could be extracted
from a single file. It did not follow extends and overrides.

Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-25 15:51:58 +01:00
Aanand Prasad
3fff286e1a Merge pull request #2727 from dbonev/2703-strict-validation-of-networks
Network fields schema validation
2016-01-25 14:39:54 +00:00
Jean-Laurent de Morlhon
01f4ffd21f Merge pull request #2752 from dgageot/google-reuse
Support creating a machine from an existing google VM
2016-01-25 15:39:51 +01:00
David Gageot
a9cbd71d94 Merge pull request #2915 from jeanlaurent/fix-985
FIX #494 - Use same binary filename scheme as other docker-project
2016-01-25 15:36:42 +01:00
Brian Goff
9211fc36a9 Merge pull request #19655 from sdurrheimer/zsh-completion-cp-follow-link
Add zsh completion for 'docker cp -L --follow-link'
2016-01-25 09:28:26 -05:00