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
Victor Vieux
74dfe8b0f6 move doc to experimental/
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-11 18:16:31 -08:00
Riyaz Faizullabhoy
6460e8b343 Add to maintainers list
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-01-11 18:00:07 -08:00
Phil Estes
cc63db4fd1 Add daemon documentation on user namespaces feature
Remove the experimental docs for user namespaces and add similar content
to the `docker daemon` command documentation.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-01-11 20:54:57 -05:00
Phil Estes
d5743a3a5c Properly report conflicting namespace options when using userns
This prevents strange errors and clarifies which namespace options are
incompatible with user namespaces (at this time).

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-01-11 20:50:22 -05:00
Kai Qiang Wu(Kennan)
8894285250 Add explanation for unexpected error msg
Fixes: #18698
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-12 01:43:59 +00:00
Sebastiaan van Stijn
3f1b16e236 Merge pull request #19192 from aidanhs/aphs-fix-ambassador-multi-port
Fix ambassador script
2016-01-11 17:41:53 -08:00
David Lawrence
5a9e06fe5c adding sha256 column to tuf_files database table
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
2016-01-11 17:31:01 -08:00
David Lawrence
89f250c253 when doing getTransport readOnly needs to be false for a key rotation as write permissions are required to retrieve keys
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
2016-01-11 17:25:23 -08:00
Victor Vieux
a2018c177c improve eventHandlers locking
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-11 17:23:48 -08:00
Sebastiaan van Stijn
656979670c Merge pull request #18998 from calavera/syslog_tls
Allow syslog over TCP+TLS.
2016-01-11 17:21:38 -08:00
Lei Jitang
79d4f0f56e Add docker network connect/disconnect to non-running container
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-11 20:13:39 -05:00
Jess Frazelle
acff8f7a9d Merge pull request #19248 from calavera/list_engine_api
List engine-api in the client libraries reference.
2016-01-11 16:40:12 -08:00
Joffrey F
ca634649bb Changed logging override test into integration test
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-11 16:25:19 -08:00
David Calavera
bce01398dd List engine-api in the client libraries reference.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-11 19:17:13 -05:00
Kim Eik
e732f4e649 Added additional container information to "docker info".
Instead of just showing the number of containers this patch will
show the number of running, paused and stopped containers as well.

Signed-off-by: Kim Eik <kim@heldig.org>
(cherry picked from commit a9804ab1cb117a132cbf460067d55f5146d50956)
2016-01-11 19:14:44 -05:00
Tibor Vass
058e6dce18 Merge pull request #19247 from tiborvass/remove-tac
Make Makefile work on OS X
2016-01-11 19:13:55 -05:00
Dong Chen
8f384b1d40 Address review comments.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-11 16:08:51 -08:00
Victor Vieux
78008f4d4a add doc
fix tests and keep swarm id
remove duplicate on node reconnect
explicit failure

Signed-off-by: Victor Vieux <vieux@docker.com>
2016-01-11 15:59:44 -08:00
Andrea Luzzardi
13f60212f5 Add support for container rescheduling on node failure.
Add rescheduling integration tests.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-01-11 15:59:44 -08:00
Andrea Luzzardi
56941d02a8 cluster: Support multiple event handlers.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-01-11 15:59:44 -08:00
Joffrey F
46a474ecd9 Move v1-v2 config normalization to separate function.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-11 15:53:28 -08:00
Victor Vieux
8cfc984869 Merge pull request #1602 from tkopczynski/typo
docs: typo in scheduler/strategy.md
2016-01-11 15:46:08 -08:00
Joffrey F
c32991a8d4 Remove superfluous service code
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-11 15:39:59 -08:00
Jess Frazelle
a96a0b3781 Merge pull request #19217 from justincormack/arm_syscalls
Add arm specific syscalls to default seccomp profile
2016-01-11 15:26:09 -08:00
Tibor Vass
df40c61f8a Make Makefile work on OS X
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-01-11 18:16:56 -05:00
Alexander Morozov
5abef06a15 Fix race on reading endpoint data
Race is with its cleanup.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-01-11 14:28:07 -08:00
Tomasz Kopczynski
3d9d6dab3a docs: typo in scheduler/strategy.md
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
2016-01-11 23:23:11 +01:00
Richard Scothern
39ff320b82 Merge pull request #1335 from RichardScothern/fix-build
Fix manifest API unit tests
2016-01-11 14:17:36 -08:00
Jess Frazelle
9c9a1d1b4b Merge pull request #19069 from jfrazelle/apparmor-regex-proc
fix proc regex
2016-01-11 13:50:25 -08:00
Richard Scothern
3ea0d70896 Fix manifest API unit tests
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2016-01-11 12:52:21 -08:00
Arnaud Porterie
f11b6a2ab3 Merge pull request #18785 from aaronlehmann/new-manifest
New image manifest format
2016-01-11 12:01:46 -08:00
John Howard
a4b77dc1af Windows CI: Setup for testing against Windows
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-11 11:52:03 -08:00
Dong Chen
cf664141b6 Scheduler prefers nodes without connection failures.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-01-11 11:42:58 -08:00
David Calavera
1a7d40c692 Merge pull request #19208 from sdurrheimer/zsh-completion-update_isolation_shm-size_memory_reservation
Zsh completion for 'docker update' + common options refactoring
2016-01-11 11:36:55 -08:00
Richard Scothern
3a1220de01 Merge pull request #1319 from RichardScothern/update-tags
Remove tags referencing deleted manifests.
2016-01-11 11:33:22 -08:00
Antonio Murdaca
55cec657bb integration-cli: log error when starting registry
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-01-11 20:16:13 +01:00
Brian Goff
0cdfd84aee Merge pull request #19239 from aaronlehmann/fix-testsuccessfuldownload
Fix flaky test TestSuccessfulDownload
2016-01-11 14:09:14 -05:00
Alexander Morozov
9a23569ecf Merge pull request #16032 from cpuguy83/remove_sqlite_dep
Build names and links at runtime - no more sqlite
2016-01-11 10:59:49 -08:00
Vivek Goyal
2dccb562df Mark device ID free only if device actually got deleted
Right now if somebody has enabled deferred device deletion, then
deleteTransaction() returns success even if device could not be deleted. It
has been marked for deferred deletion. Right now we will mark device ID free
and potentially use it again when somebody tries to create new container. And
that's wrong. Device ID is not free yet. It will become free once devices
has actually been deleted by the goroutine later.

So move the location of call to markDeviceIDFree() to a place where we know
device actually got deleted and was not marked for deferred deletion.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2016-01-11 18:57:37 +00:00
Ash Wilson
3c2aab2abe Only derive tenant ID if tenant name is supplied.
The Rackspace provider authenticates with username and API key rather than
tenant name or ID.

Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
2016-01-11 13:49:16 -05:00
Tibor Vass
2d5ca742eb Merge pull request #19076 from tianon/multiarch
Refactor multi-arch support (especially for new mostly-official multi-arch official images)
2016-01-11 13:25:55 -05:00
Thomas Hourlier
f7a7e68df6 Mount $HOME in /root to share docker config.
Fixes #2630

Signed-off-by: Thomas Hourlier <thomas.hourlier@cnode.fr>
2016-01-11 09:52:51 -08:00
Aaron Lehmann
0757a52737 Fix flaky test TestSuccessfulDownload
One of the things this test checks is that the progress indicator
completes for each download. Some progress messages may be lost because
only one message is buffered for each download, but the last progress
message is guaranteed not to be lost. The test therefore checks for a
10/10 progress indication.

However, the assumption that this is the last progress message to be
sent is incorrect. The last message is actually "Pull complete". So
check for this instead.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-11 09:46:34 -08:00
David Calavera
4b98193bea Add support for syslog over TLS.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-11 12:25:34 -05:00
Daniel Nephin
d3cd038b84 Update event field names to match the new API fields.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-11 11:51:17 -05:00
Brian Goff
2600777469 Add migration from sqlite links back to hostConfig
Before #16032, once links were setup
in the sqlite db, hostConfig.Links was cleared out.
This means that we need to migrate data back out of the sqlite db and
put it back into hostConfig.Links so that links specified on older
daemons can be used.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-11 11:31:29 -05:00
Tibor Vass
47074030f6 Merge pull request #19121 from WeiZhang555/tty-resize
Check nil Terminal to avoid panic
2016-01-11 11:29:15 -05:00
David Gageot
248596da8a Merge pull request #2802 from jeanlaurent/smarter-change-log
During release exclude merge commit from changelog
2016-01-11 16:45:50 +01:00
David Gageot
0e1bc6c7c6 Merge pull request #2803 from jeanlaurent/fix-vbox-it-test
Fix virtualbox upgrade IT
2016-01-11 16:45:31 +01:00
David Gageot
533e5b3b46 Merge pull request #2804 from dgageot/bump-0.6.0-dev
Bump to 0.6.0-dev
2016-01-11 16:45:13 +01:00