Sebastiaan van Stijn
8f42e63aa7
Merge pull request #711 from dnephin/compose-add-name-to-network
...
Support network.name in the compose schema
Upstream-commit: 30755cf340
2017-12-06 10:44:03 -08:00
Daniel Nephin
c898dfbd95
Support network.name in the compose schema.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: d0b8aa7701
2017-12-06 10:05:24 -05:00
Sebastiaan van Stijn
a369ceccde
Merge pull request #724 from dungeonmaster18/723-auto-complete-command
...
Added auto complete command for fluentd-sub-second-precision.
Upstream-commit: ea854237aa
2017-12-05 10:29:39 -08:00
Sebastiaan van Stijn
8d18b0cfab
Merge pull request #704 from albers/completion--platform
...
Add bash completion for `--platform`
Upstream-commit: 83cdc0f1bd
2017-12-04 13:19:37 -08:00
dungeonmaster18
f62beecbb7
Added auto complete command for fluentd-sub-second-precision
...
Signed-off-by: dungeonmaster18 <umesh4257@gmail.com >
Upstream-commit: d5271568a2
2017-12-01 18:39:41 +05:30
Victor Vieux
4a8c6447a6
Merge pull request #719 from vdemeester/test-secret-config-indempotence
...
Add unit tests on config/secret indempotence in stack deploy
Upstream-commit: 6b63d7b96a
2017-11-30 08:39:56 -08:00
Vincent Demeester
9818aadf77
Add unit tests on config/secret indempotence in stack deploy
...
Related PR : https://github.com/docker/cli/pull/509
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 5ed399e588
2017-11-30 09:45:32 +01:00
Vincent Demeester
617fb8ceb7
Merge pull request #702 from albers/completion-log--until
...
Add bash completion for `logs --until`
Upstream-commit: b45a49c83f
2017-11-30 09:40:08 +01:00
Harald Albers
3c7ba9bf1b
Add bash completion for --platform
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 15f78417b9
2017-11-30 09:29:15 +01:00
Sebastiaan van Stijn
02055337d8
Merge pull request #694 from riyazdf/trust-inspect
...
docker trust inspect
Upstream-commit: d921d5cc39
2017-11-29 11:33:53 -08:00
Riyaz Faizullabhoy
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
Riyaz Faizullabhoy
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
Riyaz Faizullabhoy
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
Sebastiaan van Stijn
9b7953e812
Merge pull request #718 from dnephin/fix-e2e-docker-build
...
Fix e2e build test
Upstream-commit: 1b4f2d3b73
2017-11-29 10:30:31 -08:00
Sebastiaan van Stijn
a79583a886
Merge pull request #677 from albers/completion-log-opts
...
Add new log driver options to bash completion
Upstream-commit: 4f009541cb
2017-11-29 10:01:19 -08:00
Tõnis Tiigi
fe41a825e2
Merge pull request #678 from albers/completion-build--stream
...
Add bash completion for experimental `build --stream`
Upstream-commit: c428561b63
2017-11-29 10:00:23 -08:00
Sebastiaan van Stijn
264f9d5a4f
Merge pull request #701 from albers/completion-trust-sign--local
...
Add bash completion for `trust sign --local`
Upstream-commit: e5d49c0199
2017-11-29 09:44:53 -08:00
Sebastiaan van Stijn
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
Daniel Nephin
29f2890225
Fix e2e build test
...
The build output changed in 17.11
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 16cd84024c
2017-11-29 11:02:40 -05:00
Daniel Nephin
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
Vincent Demeester
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
Sebastiaan van Stijn
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
Renaud Gaubert
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
Sebastiaan van Stijn
405736f2fc
Merge pull request #714 from doncicuto/patch-1
...
Update Flocker plugin link
Upstream-commit: e004dc01d4
2017-11-28 10:20:10 -08:00
Renaud Gaubert
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
Renaud Gaubert
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
Renaud Gaubert
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
Renaud Gaubert
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
Renaud Gaubert
6c65651aa2
Updated GenericResource CLI
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com >
Upstream-commit: 7ddd5f3434
2017-11-28 18:03:10 +01:00
Renaud Gaubert
f62d716bb0
Revendored swarmkit
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com >
Upstream-commit: 7843aec98c
2017-11-28 18:03:10 +01:00
doncicuto
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
Daniel Nephin
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
Daniel Nephin
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
Daniel Nephin
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
Ilya Sotkov
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
Ilya Sotkov
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
Ilya Sotkov
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
Daniel Nephin
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
Vincent Demeester
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
Sebastiaan van Stijn
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
Daniel Nephin
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
Daniel Nephin
1da9654cd5
Update spf13/cobra
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c01f642800
2017-11-20 12:42:11 -05:00
Skip
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
Sebastiaan van Stijn
5ddac3b8e8
Merge pull request #700 from rodolfoortiz/patch-1
...
Fixed misspelling
Upstream-commit: f6395c848c
2017-11-17 19:20:57 +01:00
Harald Albers
efb2ed5d5e
Add bash completion for logs --until
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 667dead8b7
2017-11-17 18:45:05 +01:00
Harald Albers
afb12468a8
Add bash completion for trust sign --local
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: c29459c284
2017-11-17 18:30:38 +01:00
Rodolfo Ortiz
0acfb79b17
Fixed misspelling
...
Signed-off-by: Rodolfo Ortiz <rodolfo.ortiz@definityfirst.com >
Upstream-commit: c7d8561508
2017-11-17 11:27:49 -06:00
Vincent Demeester
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
Simon Ferquel
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
Simon Ferquel
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
