David Gageot
4291b591f2
Merge pull request #2826 from dgageot/nathanleclaire-precreatecheckdoc
...
Add note about pre-create check and exit code
2016-01-13 10:36:21 +01:00
Harald Albers
40f73c7c8e
bash completion for connecting non-running containers to networks
...
Signed-off-by: Harald Albers <github@albersweb.de >
2016-01-13 10:32:23 +01:00
David Gageot
2b330c4166
Markdown lint
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-13 10:19:58 +01:00
Nathan LeClaire
c4e798cafd
Add note about pre-create check and exit code
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2016-01-13 10:19:58 +01:00
Antonio Murdaca
40d7ad98a8
Merge pull request #19275 from tonistiigi/delete-image-conflict-bitmask
...
Use bitmask for conflict checking
2016-01-13 10:00:57 +01:00
David Gageot
b589eb9475
Merge pull request #2818 from jeffellin/debugaws
...
Allow Debug messages from ec2 driver to include request / response
2016-01-13 09:13:55 +01:00
David Gageot
830d17c377
Merge pull request #2823 from nathanleclaire/panic_recovr
...
Add panic recovery to Create method for drivers
2016-01-13 09:11:11 +01:00
Riyaz Faizullabhoy
1f7d16373e
Merge pull request #439 from HuKeping/improve-logging
...
Log: improve error logging
2016-01-12 22:34:52 -08:00
David Gageot
1ff43d08b0
Bump Kitematic version to 0.9.5.1
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-13 07:29:21 +01:00
Phil Estes
9232c09cd5
Merge pull request #19281 from hqhq/hq_dont_fail_oomkilldisable
...
Do not fail if not support OomKillDisable
2016-01-12 21:54:38 -08:00
Tianon Gravi
5c161f4e1a
Update check-config.sh to use "case" instead of an associative array
...
This fixes Bash 3.x compatibility (where associative arrays are not available).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2016-01-12 20:57:56 -08:00
Madhu Venugopal
8edbd10349
Updating to the new ep.Delete API
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2016-01-12 20:42:37 -08:00
Madhu Venugopal
537089481f
Vendor libnetwork v0.5.4
...
- Removed the isNodeAlive protection when user forces an endpoint delete
- Bridge driver supporting internal network option
- Backend implementation to support "force" option to network disconnect
- Fixing a regex in etchosts package to fix docker/docker#19080
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2016-01-12 20:42:30 -08:00
Kai Qiang Wu(Kennan)
6a04ecf813
Update response content for volume mounts
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
2016-01-13 03:48:14 +00:00
Nathan LeClaire
d80ea22623
Add panic recovery to Create method for drivers
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2016-01-12 19:25:18 -08:00
HuKeping
31d79d77a3
Comment: improve some comment
...
To keep consistent with the comment about the interface.
Signed-off-by: Hu Keping <hukeping@huawei.com >
2016-01-13 10:33:14 +08:00
HuKeping
5968823ace
Log: improve error logging
...
When pushing an image to Distribution server with Notary enabled at the
first time, client will try to get the root.json and it will fail since
there is nothing in Notary yet.
This patch enhances the error message by adding the error detail.
- "404 GET notary-distribution:5678/busybox:root"
Signed-off-by: Hu Keping <hukeping@huawei.com >
2016-01-13 10:33:14 +08:00
David Lawrence
3fa73e80b9
Merge pull request #443 from docker/riyaz-maintainer
...
Add to maintainers list
2016-01-12 18:07:34 -08:00
David Lawrence
b6042d923f
Merge pull request #442 from endophage/rotate_key_not_read_only
...
when doing getTransport readOnly needs to be false
2016-01-12 18:06:28 -08:00
David Lawrence
0350d56176
renaming dockerfiles for autobuilds
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2016-01-12 18:05:21 -08:00
Victor Vieux
0e4ebbf61d
Merge pull request #1626 from vieux/experimental
...
add -experimental to enable rescheduling
2016-01-12 18:00:36 -08:00
Tonis Tiigi
42961a66a5
Avoid extracting to temp directory on building from tar
...
Fixes #15785
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-01-12 17:43:52 -08:00
Qiang Huang
7b616d4743
Do not fail if not support OomKillDisable
...
Fixes : #19278
The issue seems existed since we add support for OomKillDisable,
OomKillDisable support should not be hard request, we just
discard it if not support and move on.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2016-01-13 09:07:40 +08:00
Alexandre Beslic
254e095f77
Merge pull request #1601 from vieux/docker_discovery
...
use docker/docker/pkg/discovery and update godeps
2016-01-12 17:06:51 -08:00
Victor Vieux
18b6435839
Merge pull request #1621 from jimenez/scheduler_driver
...
Restructuring mesos scheduler driver outside of Cluster
2016-01-12 17:02:35 -08:00
Joffrey F
f774422d18
Test Volume.exists() behavior
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2016-01-12 16:58:24 -08:00
Joffrey F
9cb58b796e
Implement ability to specify external volumes
...
External volumes are created and managed by the user.
They are not namespaced.
They are expected to exist at the beginning of the up phase.
Signed-off-by: Joffrey F <joffrey@docker.com >
2016-01-12 16:53:49 -08:00
Sebastiaan van Stijn
47d87d3b92
Merge pull request #19229 from mavenugo/udlinks
...
Local alias support
2016-01-12 16:47:32 -08:00
Isabel Jimenez
443d49167a
Restructuring mesos scheduler driver outside of Cluster
...
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com >
2016-01-12 19:24:50 -05:00
Tonis Tiigi
883be48930
Use bitmask for conflict checking
...
Rather than using 2 different functions for different
types of conflicts use a bitmask to specify what
conflicts need to be checked. This allows a better way
to make exceptions.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-01-12 16:01:56 -08:00
Tibor Vass
1e1a3c9508
Merge pull request #19266 from tonistiigi/fix-untag-on-rmi-by-id
...
Fix rmi by ID untagging image on error
2016-01-12 18:56:25 -05:00
moxiegirl
62fdf2fad1
Merge pull request #1546 from moxiegirl/readme-refs-work
...
Remove readmes and point to docs
2016-01-12 15:51:59 -08:00
Joffrey F
05935b5e54
Don't recreate pre-existing volumes.
...
During the initialize_volumes phase, if a volume using the
non-namespaced name already exists, don't create the namespaced
equivalent.
Signed-off-by: Joffrey F <joffrey@docker.com >
2016-01-12 15:42:42 -08:00
Tibor Vass
56272c9e9e
Merge pull request #19060 from jfrazelle/daemon-read-seccomp
...
read seccomp profile locally then pass to daemon
2016-01-12 18:34:59 -05:00
Jonathan Stewmon
5d8c2d3cec
add support for stop_signal to compose file
...
Signed-off-by: Jonathan Stewmon <jstewmon@rmn.com >
2016-01-12 17:21:49 -06:00
Nathan LeClaire
63673243fb
Merge pull request #2807 from jeanlaurent/preCreateCheckExitStatus
...
Return exit code 3 on pre-create errors
2016-01-12 15:19:41 -08:00
David Calavera
e5edc168a6
Complete documentation about extra container information.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2016-01-12 18:16:58 -05:00
Joffrey F
ad8faad296
Merge pull request #2579 from vdemeester/update-reference-with-config-and-create
...
Add config and create to docs/reference
2016-01-12 15:16:45 -08:00
David Calavera
c0c66c57b2
Merge pull request #19170 from aaronlehmann/delete-prune-digests
...
Prune digest references when deleting by tag
2016-01-12 15:15:36 -08:00
Alexandre Beslic
e1213384bc
Merge pull request #1578 from aluzzardi/rescheduling
...
[experimental] Simple container rescheduling on node failure
2016-01-12 15:00:27 -08:00
Darren Shepherd
2aa673aed7
Lazy initialize Volume on container Mount object
...
Currently on daemon start volumes are "created" which involves invoking
a volume driver if needed. If this process fails the mount is left in a
bad state in which there is no source or Volume set. This now becomes
an unrecoverable state in which that container can not be started. The
only way to fix is to restart the daemon and hopefully you don't get
another error on startup.
This change moves "createVolume" to be done at container start. If the
start fails it leaves it in the state in which you can try another
start. If the second start can contact the volume driver everything
will recover fine.
Signed-off-by: Darren Shepherd <darren@rancher.com >
2016-01-12 17:19:59 -05:00
Aanand Prasad
d4b4b126fb
Merge pull request #2635 from aanand/use-networking
...
Use networking for version 2 Compose files
2016-01-12 22:19:50 +00:00
Dimitar Bonev
3a46abd17f
Allowed port range in exposed ports
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com >
2016-01-13 00:13:04 +02:00
David Calavera
09510c7c43
Merge pull request #19272 from sdurrheimer/zsh-completion-daemon-userns-remap
...
Add zsh completion for 'docker daemon --userns-remap'
2016-01-12 14:06:24 -08:00
Dimitar Bonev
2f07e2ac36
Ulimits are now merged into extended services
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com >
2016-01-12 23:59:23 +02:00
Alexandre Beslic
4a582897e0
Merge pull request #1600 from dongluochen/ranking
...
Scheduler prefers nodes without connection failures
2016-01-12 13:46:17 -08:00
Tonis Tiigi
38a45eed88
Fix rmi by ID untagging image on error
...
Do not untag image if it would later get a hard conflict because of running containers.
Fixes #18873
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-01-12 13:45:40 -08:00
Madhu Venugopal
2aa5f33b20
Docs update for link functionality in user-defined networks
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2016-01-12 13:38:48 -08:00
Madhu Venugopal
e221b8a3d6
Support --link for user-defined networks
...
This brings in the container-local alias functionality for containers
connected to u ser-defined networks.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2016-01-12 13:38:48 -08:00
Steve Durrheimer
54bea86b03
Add zsh completion for 'docker daemon --userns-remap'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
2016-01-12 22:38:32 +01:00