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
34cc3d6434
Remove duplication for secrets / configs, combine 3.5 loader tests, remove extraneous error call, regenerate schema correctly
...
Signed-off-by: Ilya Sotkov <ilya@sotkov.com >
Upstream-commit: ec47003ecb
2017-11-22 13:41:16 +02:00
3d2eab6bf0
Add tests for secret.name in compose files.
...
Signed-off-by: Ilya Sotkov <ilya@sotkov.com >
Upstream-commit: 1f10b31017
2017-11-22 13:18:05 +02:00
2dae51fa3d
Add secret.name and config.name in compose.
...
Signed-off-by: Ilya Sotkov <ilya@sotkov.com >
Upstream-commit: 4f7f3d2f61
2017-11-22 13:18:05 +02:00
4e6f892dc4
Merge pull request #708 from dnephin/update-cobra
...
Update spf13/cobra, fixes usages in generated man pages
Upstream-commit: 2d0e2d22ca
2017-11-21 10:51:25 +01:00
5289d7ae1c
Disable adding [flags] to UseLine in man pages
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5b4af39b8d
2017-11-20 12:48:10 -05:00
1da9654cd5
Update spf13/cobra
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c01f642800
2017-11-20 12:42:11 -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
7e12c15274
Preparing for compose schema v3.5
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com >
Upstream-commit: 787e30d57a
2017-11-17 15:30:32 +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
e26667240b
Merge pull request #693 from eiais/e2e
...
Add e2e testing for Trust revoke
Upstream-commit: 9022ea549d
2017-11-15 20:39:53 +01:00
ac513c6164
Merge pull request #671 from dnephin/remove-secret-config-duplication
...
Remove secret/config duplication in cli/compose
Upstream-commit: 801ddee343
2017-11-15 19:29:39 +01: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
ca97ddf678
add e2e testing for trust revoke
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: 4a93f207a3
2017-11-13 17:18:10 -08:00
146e3d30b9
e2e tests: refactor using fixtures
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: cbd78572a7
2017-11-13 17:18:04 -08: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
2ee46bd08b
Merge pull request #685 from eiais/e2e
...
docker trust sign: add e2e testing
Upstream-commit: 365c525fab
2017-11-13 17:31:42 +01:00
e18edc6a6b
add test for logs
...
Signed-off-by: Jamie Hannaford <jamie@limetree.org >
Upstream-commit: 9c9303e113
2017-11-13 10:57:44 +01:00
7cf0bd287e
Fix grammar
...
Signed-off-by: Mikhail Vasin <michaelvasin@gmail.com >
Upstream-commit: bdd1b1e279
2017-11-11 16:15:15 +03:00
f5ae1accb6
Add e2e testing for docker trust sign
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: eb025800bd
2017-11-10 14:26:11 -08:00
5aa9076d56
Add unit tests for some convert/service
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f1cc679618
2017-11-10 16:28:39 -05:00
50743f5357
Remove duplication in compose/convert
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a68c940f1a
2017-11-10 15:56:11 -05:00
a1783b999b
Remove duplication in loader
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 7bd26ed690
2017-11-10 15:56:11 -05:00
75f89d26b4
sign test: fix imports
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: a570e9b355
2017-11-10 11:34:04 -08: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
dcbe5b1182
Add new CLI option for --until
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com >
Upstream-commit: 6f309316e2
2017-11-10 12:38:08 +01:00
8a571d7e05
Bump moby to f4d4f5863156b82ef146b6ff1e845f8dcf019f12
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5735fff6fc
2017-11-08 17:50:58 +01: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
22f416c376
Merge pull request #670 from dnephin/cleanup-compose-volume-name
...
Only warn on volume.external.name for version 3.4
Upstream-commit: 025f51ca93
2017-11-07 14:29:22 +01:00
ce8d7a3b24
Merge pull request #474 from jhowardmsft/jjh/apis-for-platform
...
LCOW: CLI changes to add platform flag - pull, run, create and build
Upstream-commit: 042575aac9
2017-11-07 14:26:31 +01:00
9302e76682
Merge pull request #657 from dnephin/add-test-for-container-cp
...
Adding unit tests for container cp
Upstream-commit: 21d88629df
2017-11-07 14:22:22 +01:00
127d797434
Only warn on volume.external.name for version 3.4
...
Also remove use of volume.external.name
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: aea9544db5
2017-11-06 17:04:36 -05:00
fd4c48b1d3
Update Misty's GitHub handle
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 14b1535dfe
2017-11-02 16:50:38 +01:00
31ecf1d5a7
Merge pull request #661 from thaJeztah/bump-golang-to-1.8.5
...
Bump Go to 1.8.5
Upstream-commit: 5a4fe7fe05
2017-10-31 16:24:27 -04:00
dbab169d62
Bump Go to 1.8.5
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: bc8282a235
2017-10-31 21:04:59 +01:00
77f73751db
LCOW: Add --platform= CLI flag to pull/create/run/build
...
Signed-off-by: John Howard <jhoward@microsoft.com >
This is the CLI updates for the document discussed in https://github.com/moby/moby/issues/34617
to support Linux Containers on Windows. It adds --platform= as CLI flags to the four
commands listed above. Import still to be completed (needs daemon changes).
Upstream-commit: d8b782560e
2017-10-31 09:50:43 -07:00
bf8eb18312
Merge pull request #660 from thaJeztah/bump-version-to-v17.12-dev
...
Bump version to 17.12.0-dev
Upstream-commit: 1dc89aa98f
2017-10-31 16:37:42 +01:00
06a81bf15d
Merge pull request #658 from arehman199/fix-a-number-of-typos
...
fix a number of minor typos
Upstream-commit: a0140b4ddb
2017-10-31 15:07:51 +01:00
356175fe57
Bump version to 17.12.0-dev
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a195685bac
2017-10-31 12:33:06 +01:00
379ed62f4b
Merge pull request #609 from albers/completion-trust
...
Add bash completion for `docker trust` commands
Upstream-commit: d0197347ea
2017-10-31 11:24:35 +01: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
f85a09c5e7
Merge pull request #654 from dnephin/pr-fix-image-rm
...
Fix behaviour of `rmi -f` with unexpected errors
Upstream-commit: 6e04da39b8
2017-10-31 10:38:38 +01: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
