Kenfe-Mickael Laventure
42f9c25b51
Always disable containerd metrics when started by docker
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
2016-04-19 13:37:18 -07:00
Brian Goff
ab6b82b856
Merge pull request #22123 from crosbymichael/restart-canceled
...
Remove restart canceled error
2016-04-19 16:28:33 -04:00
Riyaz Faizullabhoy
ab4751d4a7
Check that leaf cert is first in bundle
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-04-19 11:47:19 -07:00
Ying Li
5576e01649
Use cdn.rawgit.com links for doc svgs rather than relative links
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-19 11:16:30 -07:00
Ahmet Alp Balkan
d1e65edad1
azure.md: typo fix
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2016-04-19 11:14:37 -07:00
Alexander Morozov
eab65e438e
Merge pull request #22153 from vdemeester/update-engine-api-again
...
Update engine api again for CopyToContainer and versions
2016-04-19 11:05:27 -07:00
Riyaz Faizullabhoy
26a95ef5a3
Handle cert bundles as key IDs
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-04-19 11:01:56 -07:00
David Lawrence
4776700215
add test for using a pinned cert ID when the root Public field has a bundle with intermediates
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2016-04-19 11:01:56 -07:00
Riyaz Faizullabhoy
94a2e3a741
Change config to disable_tofu instead of tofu
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-04-19 11:01:56 -07:00
Riyaz Faizullabhoy
8c9424f051
Allow for multiple pinned certs per gun
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-04-19 11:01:55 -07:00
Riyaz Faizullabhoy
bbf51108c0
Rename certs package to trustpinning
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-04-19 11:01:55 -07:00
Riyaz Faizullabhoy
60faca0661
Use most specific CA prefix for pinning
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-04-19 11:01:55 -07:00
Riyaz Faizullabhoy
86d9e081fb
Refactor initialization for trust pinning, intermediate cert handling
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-04-19 11:01:55 -07:00
Riyaz Faizullabhoy
b5534779df
Include trust pinning flow diagram
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-04-19 11:01:55 -07:00
Riyaz Faizullabhoy
df3bd7dba6
Refactor out trust pinning check
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-04-19 11:01:55 -07:00
Riyaz Faizullabhoy
c2f5753630
Update CA pinning logic to include intermediates, add positive test case
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-04-19 11:01:55 -07:00
Riyaz Faizullabhoy
2d065f241d
Change config parsing, add helpers to clean up config usage
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-04-19 11:01:55 -07:00
Riyaz Faizullabhoy
043f84aa62
Documentation for config, clean up tests
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-04-19 11:01:55 -07:00
Riyaz Faizullabhoy
7d6fdc08cd
Update function description for expected behavior, groundwork for config
...
in validation
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-04-19 11:01:54 -07:00
Ying Li
09f8171708
Update the diagrams to label the client, server, signer, and DBs
...
Signed-off-by: Ying Li <ying.li@docker.com >
2016-04-19 10:58:41 -07:00
David Lawrence
b8c005c304
Merge pull request #647 from docker/rethinkdb
...
Rethinkdb support for server+signer
2016-04-19 10:51:17 -07:00
Michael Crosby
fc2e2234c6
Remove restart canceled error
...
It should not be an error to call a common option to cancel restarts.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2016-04-19 10:46:21 -07:00
moxiegirl
4a8519ba29
Merge pull request #22148 from thaJeztah/remove-old-api-versions
...
Remove API versions 1.17 and older from documentation
2016-04-19 10:26:56 -07:00
Dongluo Chen
d9beef7635
Merge pull request #2136 from doronp/Fix_Docs
...
Fix docs
2016-04-19 10:20:40 -07:00
Vincent Demeester
75cc2c926b
Merge pull request #21495 from HackToday/addnetworkfilter
...
Add network label filter support
2016-04-19 19:15:14 +02:00
Richard Scothern
cd27f179f2
Merge pull request #1635 from hopkings2008/notifytype
...
use context.GetLogger to replace logrus in listener
2016-04-19 10:04:23 -07:00
Alexander Morozov
2f7df8e5de
Merge pull request #22121 from tonistiigi/fix-exec-cleanup
...
Clean up exec fifos on process exit
2016-04-19 09:45:54 -07:00
Brian Goff
60548927b3
Merge pull request #22156 from jaredhocutt/netappdvp
...
Add the NetApp Docker Volume Plugin to the documentation
2016-04-19 11:43:00 -04:00
Jared Hocutt
f310fd14a9
Add the NetApp Docker Volume Plugin to the documentation
...
Signed-off-by: Jared Hocutt <jaredh@netapp.com >
2016-04-19 11:30:39 -04:00
Vincent Demeester
49f7b4dafb
Remove pkg/version
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2016-04-19 16:57:02 +02:00
Vincent Demeester
7534f17261
Update code for latest engine-api
...
- Update CopyToContainer uses
- Use engine-api/types/versions instead of pkg/version
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2016-04-19 16:56:54 +02:00
Vincent Demeester
04bb3a2f45
Vendoring engine-api to a2999dbd3471ffe167f2aec7dccb9fa9b016dcbc
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2016-04-19 15:50:20 +02:00
Doron Podoleanu
7e119761d4
Fix docs
...
Signed-off-by: Doron Podoleanu <doronp@il.ibm.com >
2016-04-19 16:11:57 +03:00
Quentin Perez
b3db3925d9
Add Scaleway Docker Machine Driver Plugin
...
Signed-off-by: Quentin Perez <qperez@ocs.online.net >
2016-04-19 14:41:29 +02:00
Sebastiaan van Stijn
68f9a45440
Remove API versions 1.17 and older from documentation
...
Docker 1.5 and older is no longer supported by Docker Hub,
so there's not much need to document the API for those
versions.
Documentation is still available on GitHub, and through
the older versions of the documentation for those
that really need it.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-04-19 14:39:14 +02:00
Stefan Majewsky
9a67520af7
wait for DLO segments to show up when Close()ing the writer
...
Not just when Commit()ing the result. This fixes some errors I observed
when the layer (i.e. the DLO) is Stat()ed immediately after closing,
and reports the wrong file size because the container listing is not
yet up-to-date.
Signed-off-by: Stefan Majewsky <stefan.majewsky@sap.com >
2016-04-19 14:31:49 +02:00
Brian Goff
8adc8c3a68
Merge pull request #21901 from mavenugo/sid
...
Add container's short-id as default network alias
2016-04-19 08:16:41 -04:00
Aanand Prasad
cafe1315b2
Merge pull request #3334 from werehuman/fix-config-hash-change
...
Fix #3248 : Accidental config_hash change
2016-04-19 12:42:19 +01:00
Brian Goff
42a7efd691
Merge pull request #22122 from Microsoft/jjh/defaultdir
...
Windows: Set default directory
2016-04-19 07:27:13 -04:00
Aanand Prasad
984f839d33
Merge pull request #3263 from twitherspoon/3191_2_help_cli_feature
...
Added code to support no argument help command
2016-04-19 12:14:24 +01:00
Aanand Prasad
d21e1c5a30
Merge pull request #3335 from johnharris85/master
...
Fix CLI docstring to reflect Docopt behaviour.
2016-04-19 12:13:20 +01:00
Aanand Prasad
52fa010ac7
Merge pull request #3337 from dnephin/check_for_short_id_alias
...
Check for short id alias, and don't disconnect if it already exists
2016-04-19 12:12:43 +01:00
Vincent Demeester
9534a8220c
Merge pull request #22135 from yongtang/22100-docs-container-creation-param
...
Docs: Container creation param descriptions not under HostConfig
2016-04-19 12:17:22 +02:00
Wen Cheng Ma
91b7157064
Deprecated of docker ps since and before options for v1.12
...
Deprecated note https://github.com/docker/docker/blob/master/docs/deprecated.md#docker-ps-before-and-since-options
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
2016-04-19 18:13:55 +08:00
David Lawrence
ae133606ad
pass checksum to GetOrCreateSnapshot. One timestamp test now obsolete as we always regenerate a timestamp when regenerating a snapshot, other test has one error change because we now look for an explicit checksum, hence writing incorrect data to DB for the snapshot results in a rather than a
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2016-04-18 22:07:11 -07:00
Yong Tang
332e3b545b
Docs: Container creation param descriptions not under HostConfig
...
This fix tries to fix issues mentioned in #22100 for incorrect
description of remote API's container creation params.
Several issues have been fixed:
1. CPU and memory related params (e.g., `MemorySwap`, `CpuShares`, etc.)
were incorrectly placed under the top level instead of under the HostConfig.
(v1.18-v1.24)
2. The param `Cpuset` has been deprecated but was never removed.
(v1.18-v1.24)
3. The param `PidsLimit` was not added even though the description
has been added.
(v1.23-v1.24)
This fix fixes #22100
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
2016-04-18 21:15:33 -07:00
David Lawrence
3e5d6d1f31
review from Hukeping
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2016-04-18 20:57:45 -07:00
David Calavera
7fd53f7c71
Merge pull request #21657 from vdemeester/update-engine-api
...
Update engine api with required arguments
2016-04-18 19:47:22 -07:00
David Calavera
aeb1e45e60
Merge pull request #22130 from Microsoft/jstarks/win_pidfile
...
Windows: don't overwrite PID file if process exists
2016-04-18 19:45:18 -07:00
Pradeep Padala
53302b32b4
Updating instructions for adding dependencies
...
Instructions for adding a new dependency
Signed-off-by: Pradeep Padala <pradeep@containerx.io >
2016-04-18 17:51:11 -07:00