cbde088d23
Merge pull request #716 from vdemeester/bump-go
...
Bump Go to 1.9.2
Upstream-commit: 8abb266043
2017-11-29 09:42:58 -05:00
1433c3b1eb
Bump Go to 1.9.2
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6859a7387b
2017-11-29 09:16:03 +01: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
2598a6cd6a
Added support of Generic resources in compose file
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com >
Upstream-commit: 1ff73f867d
2017-11-28 21:52:09 +01:00
405736f2fc
Merge pull request #714 from doncicuto/patch-1
...
Update Flocker plugin link
Upstream-commit: e004dc01d4
2017-11-28 10:20:10 -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
2eb0bb6fa6
Added Generic Resource tests
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com >
Upstream-commit: 51c7cd91cf
2017-11-28 18:03:10 +01:00
6c65651aa2
Updated GenericResource CLI
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com >
Upstream-commit: 7ddd5f3434
2017-11-28 18:03:10 +01:00
f62d716bb0
Revendored swarmkit
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com >
Upstream-commit: 7843aec98c
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
8a8ecdb59d
Merge pull request #709 from dnephin/e2e-docker-build
...
Add e2e test for docker build
Upstream-commit: 6476524c74
2017-11-23 13:54:41 -05: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
db4f5614fc
Merge pull request #668 from ilyasotkov/667-secret-config-names
...
Add "name" field to secrets and configs to allow interpolation in Compose files
Upstream-commit: 8d41ba082b
2017-11-22 13:33:59 -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
6a9797ecaa
Add e2e test for docker build
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 7adb4c4b1e
2017-11-21 13:24:37 -05: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
408fe754a6
Merge pull request #705 from scipio3000/patch-1
...
Docs - Typo in volume plugin doc
Upstream-commit: 10e04c4b72
2017-11-20 18:55:51 +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
5ddac3b8e8
Merge pull request #700 from rodolfoortiz/patch-1
...
Fixed misspelling
Upstream-commit: f6395c848c
2017-11-17 19:20:57 +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
884d22e3a4
Merge pull request #695 from mistyhacks/update-service-port-syntax
...
Add info about new port mapping syntax
Upstream-commit: 0fe5dcd2f2
2017-11-16 17:36:44 +01: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
7b0db0e401
Merge pull request #691 from PatrickLang/patricklang-user
...
Docs - Adding note about creating Windows users
Upstream-commit: 50d218bd06
2017-11-14 11:10:56 +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
6729c4835f
Merge pull request #686 from mvasin/patch-1
...
Fix grammar
Upstream-commit: 48f4003591
2017-11-11 15:45:39 +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
