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
Jeff Nickoloff
c4a72491ec Decoupled RPC Types from API
Added compatibility for both 5.0 and 5.1 RPC plugins.
Addresses #2325

Signed-off-by: Jeff Nickoloff <jeff@allingeek.com>

	modified:   libmachine/drivers/plugin/register_driver.go
	modified:   libmachine/drivers/rpc/client_driver.go
2015-11-25 13:02:31 -08:00
Troels Thomsen
e8f8f4034e Remove name verification
Signed-off-by: Troels Thomsen <troels@thomsen.io>
2015-11-25 21:16:28 +01:00
Troels Thomsen
ca9f0451a6 Use case of type name
Signed-off-by: Troels Thomsen <troels@thomsen.io>
2015-11-25 21:12:49 +01:00
Jessica Frazelle
68c9ebdf1f Remove ipc rule in docker-engine apparmor profile
On a ubuntu 15.04 machine with apparmor_parser version 2.10 I get
```
Syntax Error: Unknown line found in file:
/etc/apparmor.d/docker-engine line: 26
```
when running `aa-complain /etc/apparmor.d/docker-engine`.

It's super weird because ipc is documented in the apparmor manual, but it
doesnt seem to be working at all. Tested on a few servers.

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-25 11:32:00 -08:00
Richard Scothern
4874f111ea Merge pull request #1208 from farmerworking/fix-oss-doc-error
Oss secure option default to true, Fix doc error
2015-11-25 11:25:25 -08:00
Richard Scothern
7647f7fe76 Merge pull request #1204 from MHBauer/gh1197
Formatting content digest calculation to avoid copyright symbols
2015-11-25 11:24:06 -08:00
Michael Crosby
3422858653 Merge pull request #18213 from crawford/18212-fix-api-server
Revert "Return listenbuffer behavior"
2015-11-25 10:49:31 -08:00
Jessica Frazelle
c0f7fdc025 Fix parsing of apparmor pcre syntax
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-25 10:38:18 -08:00
Nathan LeClaire
3ddea9f53f Merge pull request #2409 from dgageot/more-commands-tests
Add more command tests
2015-11-25 10:25:09 -08:00
David Gageot
79efe19887 Simpler code
Signed-off-by: David Gageot <david@gageot.net>
2015-11-25 19:01:12 +01:00
Nathan LeClaire
20f789a203 Merge pull request #2412 from jeanlaurent/fix-2410
Fix #2410 - regression in docker-machine inspect payload
2015-11-25 09:52:59 -08:00
Jean-Laurent de Morlhon
67b83f518f Fix #2410
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
Reviewed-by: David Gageot <david@gageot.net>
2015-11-25 18:27:35 +01:00
Michal Gebauer
bcd0f0cdc4 Check if CertsDir is not empty
Signed-off-by: Michal Gebauer <mishak@mishak.net>
2015-11-25 18:12:19 +01:00
David Calavera
ad67f324cc Merge pull request #17799 from runcom/deprecate-hc-cont-start
Deprecate HostConfig at API container start
2015-11-25 09:11:12 -08:00
Aanand Prasad
7b893164a4 Merge pull request #2450 from dnephin/fix_env_file_ordering
Fix env_file overrides with extends
2015-11-25 16:35:40 +00:00
Daniel Nephin
e67bc2569c Properly resolve environment from all sources.
Split env resolving into two phases. The first phase is to expand the paths
of env_files, which is done before merging extends. Once all files are merged
together, the final phase is to read the env_files and use them as the base
for environment variables.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-25 11:02:20 -05:00
Sebastiaan van Stijn
9bd5fd8926 Merge pull request #18223 from thaJeztah/fix-table-markup
Fix markup for markdown table
2015-11-25 16:26:53 +01:00
Aanand Prasad
cfb1b37da2 Merge pull request #2405 from dnephin/move_all_validation_to_config
Move all validation to config
2015-11-25 15:16:21 +00:00
Brian Goff
1beb450fa6 Merge pull request #18215 from mountkin/test-for-18181
add a test to make sure port is allowed in images filter
2015-11-25 10:14:09 -05:00
Sebastiaan van Stijn
aa4fa98ed7 Merge pull request #18233 from moxiegirl/carry-17231
Moving prerequisite from #17231
2015-11-25 16:12:05 +01:00
Sebastiaan van Stijn
dd3634b3c1 revert README changes in vendored files
PR https://github.com/docker/docker/pull/17986
inadvertently included changes to some vendored files.

This reverts those changes.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-11-25 16:07:43 +01:00
Vincent Demeester
1892556375 Merge pull request #18209 from martingkelly/18207-deb-multiarch
install.sh: fix for multiarch deb/ubuntu
2015-11-25 16:02:36 +01:00
Andrea Luzzardi
905a8c8e5a Add parallel label affinity integration tests.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-11-25 06:58:06 -08:00
Andrea Luzzardi
0961c1e48a Add parallel to integration test environment.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-11-25 06:57:51 -08:00
moxiegirl
afaf288316 Merge pull request #17926 from HackToday/15896-fix-volume-options
Fixing the volume options doc
2015-11-25 06:57:05 -08:00
Andrea Luzzardi
9310a385af Set labels for pending containers.
Fixes docker/compose#2447

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-11-25 06:56:57 -08:00
Vincent Demeester
06e4da9c5d Merge pull request #18228 from bboreham/existent-spelling
Fix spelling 'non-existant' -> 'non-existent'
2015-11-25 15:52:17 +01:00
Madhu Venugopal
2efdb8cbf5 Make discovery ttl and heartbeat configurable
Docker daemon uses kv-store as the host-discovery backend.
Discovery module tracks the liveness of a node through a simple
keepalive mechanism.  The keepalive mechanism depends on every
node performing heartbeat by registering itself with the discovery
module (via KV-Store Put operation). And for every Put operation,
the discovery module in all other nodes will receive a Watch
notification. That keeps the node alive.
Any node that fails to register itself within the TTL timer is
considered dead and removed from the discovery database.

The default timer (heartbeat = 20 seconds & ttl = 60 seconds)
works fine for small clusters.  But for large clusters, these
default timers are extremely aggressive and that causes high CPU
& most of the processing is spent managing the node discovery
and that impacts normal daemon operation.

Hence we need a way to make the discovery ttl and heartbeat
configurable.  As the cluster size grows, the user can change
these timers to make sure the daemon scales.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-11-25 06:51:55 -08:00
Mary Anthony
20f1a7b496 Moving prerquisite from #17231
Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-25 06:51:23 -08:00
moxiegirl
1c3e4c5b9f Merge pull request #17231 from zelahi/9745-addapparmor-note
Adding note about apparmor install on Ubuntu
2015-11-25 06:45:42 -08:00
mqliang
302325a3aa move defer statement for readability
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-11-25 22:33:15 +08:00
Andrea Luzzardi
58ee815ec2 Merge pull request #1432 from abronan/fix_ci
Update docker version for swarm-test-env
2015-11-25 15:23:53 +01:00
Bryan Boreham
899caaca9c Fix spelling of 'existent'
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2015-11-25 13:45:37 +00:00
David Gageot
742cdb958b Add more command tests
Signed-off-by: David Gageot <david@gageot.net>
2015-11-25 14:23:29 +01:00
David Gageot
05c5ff5a16 Merge pull request #2406 from nathanleclaire/testable_interfaces_env_test
Add interfaces for command testing, and unit test for `docker-machine env`
2015-11-25 14:22:27 +01:00
James Turnbull
9cbfa7b00b Merge pull request #18227 from thaJeztah/fix-api-changes
docs: move API changes to the correct API version
2015-11-25 08:20:13 -05:00
Sebastiaan van Stijn
a06d5273b3 docs: move API changes to the correct API version
These changes were made as part of https://github.com/docker/docker/pull/17478
but inadvertently added to the v1.21 API version.

Also added a short description to the API changelog.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-11-25 14:10:18 +01:00
James Turnbull
e6a491fa8f Merge pull request #18225 from thaJeztah/fixup-tabs
docs: fixups for plugin drivers in docker info
2015-11-25 08:03:35 -05:00
Sebastiaan van Stijn
0a7e45e95c docs: fixups for plugin drivers in docker info
Plugin drivers were added to docker info in
https://github.com/docker/docker/pull/17300

but not added to the example output in the online
docs.

Also fixed mixed tabs/spaces in the API documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-11-25 13:54:54 +01:00
Sebastiaan van Stijn
bfdd94b0a8 Fix markup for markdown table
Our tooling used to convert Markdown to HTML doesn't
properly handle '|' symbols embeded in code blocks
inside a table.

Changed the table to a plain HTML table as a workaround.

Also fixed indentation levels of two code examples.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-11-25 12:38:15 +01:00
Kai Qiang Wu(Kennan)
41a36529a7 Fixing the volume options doc
Fixes #15896
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2015-11-25 03:56:55 -06:00
Isabel Jimenez
185a46481a Enabling glog for mesos
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2015-11-25 04:40:03 -05:00
Isabel Jimenez
e71bda76f8 Improving error output for bad swarm mesos user
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2015-11-25 04:24:08 -05:00
Isabel Jimenez
484edd33cd Changing offers timeout default to prevent other frameworks starvation
Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
2015-11-25 04:01:30 -05:00
Zuhayr Elahi
0480da4d8c 1. Adding note about apparmor install on Ubuntu
2. modified page to remove note for apparmor and added it as a requirement for installing it on ubuntu
3. moved note to under prerequisites section

Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
2015-11-24 22:53:14 -08:00
Mika Andrianarijaona
b1fcc307cc Changed accelerator 2015-11-25 09:29:36 +03:00
farmerworking
8acf5a4d63 Oss secure option default to true, Fix doc error
Signed-off-by: farmerworking <farmerworking@gmail.com>
2015-11-25 12:38:44 +08:00
Shijiang Wei
8819b530db add a test to make sure port is allowed in images filter
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-11-25 10:46:23 +08:00
Alex Crawford
a8b84cd8fb Revert "Return listenbuffer behavior"
This reverts commit 281a48d092.

Signed-off-by: Alex Crawford <alex.crawford@coreos.com>
2015-11-24 18:32:57 -08:00
Nathan LeClaire
47da7f8314 Add interfaces for CLI unit testing and env test
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-24 18:09:27 -08:00