7fa76a7822
Corrected descriptions for MAC_ADMIN and MAC_OVERRIDE
...
The description for capabilities are mismatched for MAC_ADMIN and MAC_OVERRIDE.
Signed-off-by: T K Sourabh <sourabhtk37@gmail.com >
Upstream-commit: afcc78aae3
2017-12-21 16:06:32 +05:30
1f700eda21
Fix typo in link
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 946cb0d4fd
2017-12-20 15:35:22 -08:00
5e5a802f6b
Merge pull request #753 from thaJeztah/image-shortid
...
Updated deprecation status for "repository:shortid"
Upstream-commit: 69b11daa77
2017-12-15 01:35:11 -08:00
14b537bf91
Updated deprecation status for "repository:shortid"
...
The `repository:shortid` syntax for referencing images is very little used,
collides with with tag references can be confused with digest references.
The `repository:shortid` notation was deprecated in Docker 1.13, and scheduled
for removal in Docker 17.12.
This patch updates the deprecation status for this feature.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 1a21ca12a6
2017-12-14 14:23:17 -08:00
3ac0d82798
Fix "on-failure" restart policy being documented as "failure"
...
Commit ddadd3db49github@gone.nl >
Upstream-commit: 43217d7332
2017-12-14 13:50:56 -08:00
05b6e11768
Merge pull request #748 from thaJeztah/fix-storage-driver-anchors
...
Fix anchors to "Storage driver options"
Upstream-commit: 6a2b9d0267
2017-12-13 09:53:05 -08:00
faf7b2e58e
Merge pull request #747 from thaJeztah/17.12-update-deprecated
...
Update docs and completion-scripts for deprecated features
Upstream-commit: 619c40fac5
2017-12-13 00:02:26 -08:00
ea904b1a94
Fix anchors to "Storage driver options"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 630f8b1254
2017-12-12 17:27:05 -08:00
ee5a10619c
Update docs and completion-scripts for deprecated features
...
- the `--disable-legacy-registry` daemon flag was removed
- duplicate keys with conflicting values for engine labels
now produce an error instead of a warning.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a119e39f0c
2017-12-12 17:09:38 -08:00
467a8bb243
Correct references to --publish long syntax in docs
...
This is the same issue as described at docker/docker.github.io#5370
Signed-off-by: Lachlan Cooper <lachlancooper@gmail.com >
Upstream-commit: 90f44e564b
2017-12-13 10:25:43 +11:00
5deca4bbe1
introduce —workdir option for docker exec
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: 591a1273fd
2017-12-06 17:24:01 +01:00
02055337d8
Merge pull request #694 from riyazdf/trust-inspect
...
docker trust inspect
Upstream-commit: d921d5cc39
2017-11-29 11:33:53 -08:00
f8c7f6621d
Use default inspect formatting, remove omitempty, update docs
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: a9428285f0
2017-11-29 10:52:35 -08:00
b1e7ee7a82
support multiple arguments to trust inspect
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 1eb87cc096
2017-11-29 10:52:34 -08:00
7e9b53fd42
add docker trust inspect command for JSON viewing
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: cd38d39d0d
2017-11-29 10:52:34 -08:00
40b8aa0152
Merge pull request #467 from estesp/chown-flag-docs
...
Add docs for Dockerfile ADD/COPY --chown flag
Upstream-commit: 12765c318f
2017-11-29 09:28:30 -08:00
67203bb69e
Merge pull request #429 from RenaudWasTaken/generic-resource
...
Integrated Generic resource in service create
Upstream-commit: 97b148b440
2017-11-28 18:01:42 -08:00
77a39cce80
Added support for generic resource update
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com >
Upstream-commit: 20a6ff32ee
2017-11-28 18:03:10 +01:00
025793bb76
Added docs for service create
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com >
Upstream-commit: 4a6da88f7a
2017-11-28 18:03:10 +01:00
4ba8859964
Added docs for dockerd
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com >
Upstream-commit: fe07ca70d6
2017-11-28 18:03:10 +01:00
0637acf0b1
Update Flocker plugin link
...
ClusterHQ shutted down at the end of 2016. It seems that ScatterHQ is a group of ClusterHQ former employees that have forked Flocker. It seems that no code has been commited in the last months but if somebody comes to this Docker page it should be referenced to ScatterHQ.
Signed-off-by: Miguel Angel Alvarez Cabrerizo <doncicuto@gmail.com >
Upstream-commit: 3e6e54a90f
2017-11-28 13:51:08 +01:00
c34d673f0c
Merge pull request #689 from thaJeztah/remove-daemon-subcommand
...
Remove deprecated "daemon" subcommand
Upstream-commit: 227dfea9e1
2017-11-23 11:10:50 -05:00
c23d72ffe9
Docs - Typo in volume plugin doc
...
There is a typo in the `plugins_volume.md#volumedriverpath` section.
The `/VolumeDriver.Path` response (v1) should be `Mountpoint`and not `Mountpoin`.
Signed-off-by: scipio3000 <gunther@gameslabs.net >
Signed-off-by: Günther Jungbluth <gunther@gameslabs.net >
Upstream-commit: e575b8e756
2017-11-20 15:56:09 +01:00
0acfb79b17
Fixed misspelling
...
Signed-off-by: Rodolfo Ortiz <rodolfo.ortiz@definityfirst.com >
Upstream-commit: c7d8561508
2017-11-17 11:27:49 -06:00
f9712fa620
Merge pull request #426 from simonferquel/service-isolation
...
--isolation for setting swarm service isolation mode
Upstream-commit: 5e2be6584a
2017-11-17 15:39:43 +01:00
c5471a4a0e
Add isolation mode on service update/create and compose files
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com >
Upstream-commit: 47cf2ea683
2017-11-17 15:31:13 +01:00
3be11a0388
Merge pull request #697 from squeegels/patch-1
...
Fixed typo under User section
Upstream-commit: d981bfa964
2017-11-17 09:31:06 +01:00
83579492a6
Fixed typo under User section
...
Signed-off-by: root <root@clientele.co.za >
Signed-off-by: Squeegels <lmscrewy@gmail.com >
Signed-off-by: Squeegels <1674195+squeegels@users.noreply.github.com >
Upstream-commit: 032f676717
2017-11-17 09:47:41 +02:00
f78101e94a
Add info about new port mapping syntax
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 9ef7caa6fe
2017-11-15 17:58:13 -08:00
cf38fd827e
Merge pull request #74 from jamiehannaford/until-logging
...
Add new CLI option for --until
Upstream-commit: 026c6db6f6
2017-11-14 18:49:46 +01:00
e9b472f2e1
Add docs
...
Signed-off-by: Jamie Hannaford <jamie@limetree.org >
Upstream-commit: 0450a2f437
2017-11-14 18:04:10 +01:00
66527d3a87
Adding note about creating Windows users
...
Signed-off-by: Patrick Lang <plang@microsoft.com >
Upstream-commit: cc35724c17
2017-11-13 11:43:38 -08:00
293c21ca60
Remove deprecated "daemon" subcommand
...
The `docker daemon` subcommand was only present for
backward compatibility, but deprecated in v1.13,
and scheduled for removal in v17.12
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: c6a3199236
2017-11-13 19:01:35 +01:00
7cf0bd287e
Fix grammar
...
Signed-off-by: Mikhail Vasin <michaelvasin@gmail.com >
Upstream-commit: bdd1b1e279
2017-11-11 16:15:15 +03:00
d77f572b3a
Remove extra spaces from service creation examples
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 80211acee9
2017-11-10 10:14:56 -08:00
edb2c3c5b1
Merge pull request #575 from eiais/local-flag
...
trust sign: add --local flag
Upstream-commit: ee0615dc97
2017-11-07 14:15:53 -05:00
70aedb437f
fix a number of minor typos
...
Fix 19 typos, grammatical errors and duplicated words.
These fixes have minimal impact on the code as these are either in the
doc files or in comments inside the code files.
Signed-off-by: Abdur Rehman <abdur_rehman@mentor.com >
Upstream-commit: c3fe9d85ef
2017-10-31 15:21:51 +05:00
57801c5154
trust sign: add --local flag
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: f5a50650d6
2017-10-30 16:06:03 -07:00
7878df6b36
Merge pull request #655 from eiais/extraQuote
...
Remove extra quotes from docker trust sign
Upstream-commit: 65398de1a6
2017-10-30 13:53:18 -04:00
7b52a0b8c0
Merge pull request #648 from thaJeztah/fix-host-add-description
...
Fix flag description for --host-add
Upstream-commit: a79e742bfc
2017-10-30 13:52:29 -04:00
48cf1a4fab
Remove extra quotes from docker trust sign
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: 291fdcfdbe
2017-10-30 10:31:21 -07:00
dd79157d92
Merge pull request #566 from riyazdf/docker-trust-2
...
docker trust: interact with signers and keys
Upstream-commit: 0c4fa699eb
2017-10-30 17:03:58 +01:00
2f9ed9f2a3
review feedback: updating for windows, error paths
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: e189a21a25
2017-10-30 16:55:59 +01:00
506e33cdf2
trust: move signer and key commands down one level
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 532d223db4
2017-10-30 16:53:54 +01:00
222f56b982
docs: add docs for new trust subcommands
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 4e797eaa04
2017-10-30 16:53:54 +01:00
88e8779c7d
Merge pull request #623 from johndmulhausen/master
...
Removing titles from md files
Upstream-commit: 92afc3f474
2017-10-30 14:01:58 +01:00
772cdcbf0c
Fix flag description for --host-add
...
The `--host-add` flag adds a new `host:ip` mapping. Even though
adding an entry is idempotent (adding the same mapping multiple
times does not update the service's definition), it does not
_update_ an existing mapping with a new IP-address (multiple
IP-addresses can be defined for a host).
This patch removes the "or update" part from the flag's
description.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 79b19cba16
2017-10-28 16:47:53 +02:00
e0db409186
Adds unpause output to docs
...
Signed-off-by: Jesse Adametz <jesseadametz@gmail.com >
Upstream-commit: 8bf99be0c7
2017-10-26 23:55:03 -07:00
6c4fe5e7de
Merge pull request #642 from dnephin/use-upstream-spf13-cobra
...
Use upstream spf13 cobra
Upstream-commit: e59f3e2925
2017-10-26 10:05:11 +02:00
2613cd4235
Merge pull request #644 from thaJeztah/fix-daemon-config-example
...
Fix daemon.json runtime example
Upstream-commit: 41797e1753
2017-10-26 09:31:57 +02:00
