Commit Graph

5616 Commits

Author SHA1 Message Date
Sebastiaan van Stijn d921d5cc39
Merge pull request #694 from riyazdf/trust-inspect
docker trust inspect
2017-11-29 11:33:53 -08:00
Riyaz Faizullabhoy a9428285f0 Use default inspect formatting, remove omitempty, update docs
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-11-29 10:52:35 -08:00
Riyaz Faizullabhoy 1eb87cc096 support multiple arguments to trust inspect
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-11-29 10:52:34 -08:00
Riyaz Faizullabhoy cd38d39d0d add docker trust inspect command for JSON viewing
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-11-29 10:52:34 -08:00
Sebastiaan van Stijn 1b4f2d3b73
Merge pull request #718 from dnephin/fix-e2e-docker-build
Fix e2e build test
2017-11-29 10:30:31 -08:00
Sebastiaan van Stijn 4f009541cb
Merge pull request #677 from albers/completion-log-opts
Add new log driver options to bash completion
2017-11-29 10:01:19 -08:00
Tõnis Tiigi c428561b63
Merge pull request #678 from albers/completion-build--stream
Add bash completion for experimental `build --stream`
2017-11-29 10:00:23 -08:00
Sebastiaan van Stijn e5d49c0199
Merge pull request #701 from albers/completion-trust-sign--local
Add bash completion for `trust sign --local`
2017-11-29 09:44:53 -08:00
Sebastiaan van Stijn 12765c318f
Merge pull request #467 from estesp/chown-flag-docs
Add docs for Dockerfile ADD/COPY --chown flag
2017-11-29 09:28:30 -08:00
Daniel Nephin 16cd84024c Fix e2e build test
The build output changed in 17.11

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-11-29 11:02:40 -05:00
Daniel Nephin 8abb266043
Merge pull request #716 from vdemeester/bump-go
Bump Go to 1.9.2
2017-11-29 09:42:58 -05:00
Vincent Demeester 6859a7387b
Bump Go to 1.9.2
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-11-29 09:16:03 +01:00
Sebastiaan van Stijn 97b148b440
Merge pull request #429 from RenaudWasTaken/generic-resource
Integrated Generic resource in service create
2017-11-28 18:01:42 -08:00
Renaud Gaubert 1ff73f867d Added support of Generic resources in compose file
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com>
2017-11-28 21:52:09 +01:00
Sebastiaan van Stijn e004dc01d4
Merge pull request #714 from doncicuto/patch-1
Update Flocker plugin link
2017-11-28 10:20:10 -08:00
Renaud Gaubert 20a6ff32ee Added support for generic resource update
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com>
2017-11-28 18:03:10 +01:00
Renaud Gaubert 4a6da88f7a Added docs for service create
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com>
2017-11-28 18:03:10 +01:00
Renaud Gaubert fe07ca70d6 Added docs for dockerd
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com>
2017-11-28 18:03:10 +01:00
Renaud Gaubert 51c7cd91cf Added Generic Resource tests
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com>
2017-11-28 18:03:10 +01:00
Renaud Gaubert 7ddd5f3434 Updated GenericResource CLI
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com>
2017-11-28 18:03:10 +01:00
Renaud Gaubert 7843aec98c Revendored swarmkit
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com>
2017-11-28 18:03:10 +01:00
doncicuto 3e6e54a90f 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>
2017-11-28 13:51:08 +01:00
Daniel Nephin 6476524c74
Merge pull request #709 from dnephin/e2e-docker-build
Add e2e test for docker build
2017-11-23 13:54:41 -05:00
Daniel Nephin 227dfea9e1
Merge pull request #689 from thaJeztah/remove-daemon-subcommand
Remove deprecated "daemon" subcommand
2017-11-23 11:10:50 -05:00
Daniel Nephin 8d41ba082b
Merge pull request #668 from ilyasotkov/667-secret-config-names
Add "name" field to secrets and configs to allow interpolation in Compose files
2017-11-22 13:33:59 -05:00
Ilya Sotkov ec47003ecb 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>
2017-11-22 13:41:16 +02:00
Ilya Sotkov 1f10b31017 Add tests for secret.name in compose files.
Signed-off-by: Ilya Sotkov <ilya@sotkov.com>
2017-11-22 13:18:05 +02:00
Ilya Sotkov 4f7f3d2f61 Add secret.name and config.name in compose.
Signed-off-by: Ilya Sotkov <ilya@sotkov.com>
2017-11-22 13:18:05 +02:00
Daniel Nephin 7adb4c4b1e Add e2e test for docker build
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-11-21 13:24:37 -05:00
Vincent Demeester 2d0e2d22ca
Merge pull request #708 from dnephin/update-cobra
Update spf13/cobra, fixes usages in generated man pages
2017-11-21 10:51:25 +01:00
Sebastiaan van Stijn 10e04c4b72
Merge pull request #705 from scipio3000/patch-1
Docs - Typo in volume plugin doc
2017-11-20 18:55:51 +01:00
Daniel Nephin 5b4af39b8d Disable adding [flags] to UseLine in man pages
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-11-20 12:48:10 -05:00
Daniel Nephin c01f642800 Update spf13/cobra
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-11-20 12:42:11 -05:00
Skip e575b8e756 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>
2017-11-20 15:56:09 +01:00
Daniel Nephin bace33d7a8
Fix TestAttachExitCode
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-11-17 18:12:48 -08:00
Kenfe-Mickael Laventure 66661761d5
attach: Use ContainerWait instead of Inspect
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-11-17 18:12:46 -08:00
Sebastiaan van Stijn f6395c848c
Merge pull request #700 from rodolfoortiz/patch-1
Fixed misspelling
2017-11-17 19:20:57 +01:00
Harald Albers 667dead8b7 Add bash completion for `logs --until`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-11-17 18:45:05 +01:00
Harald Albers c29459c284 Add bash completion for `trust sign --local`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-11-17 18:30:38 +01:00
Rodolfo Ortiz c7d8561508 Fixed misspelling
Signed-off-by: Rodolfo Ortiz <rodolfo.ortiz@definityfirst.com>
2017-11-17 11:27:49 -06:00
Vincent Demeester 5e2be6584a
Merge pull request #426 from simonferquel/service-isolation
--isolation for setting swarm service isolation mode
2017-11-17 15:39:43 +01:00
Simon Ferquel 47cf2ea683 Add isolation mode on service update/create and compose files
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
2017-11-17 15:31:13 +01:00
Simon Ferquel 787e30d57a Preparing for compose schema v3.5
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
2017-11-17 15:30:32 +01:00
Vincent Demeester d981bfa964
Merge pull request #697 from squeegels/patch-1
Fixed typo under User section
2017-11-17 09:31:06 +01:00
squeegels 032f676717 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>
2017-11-17 09:47:41 +02:00
Vincent Demeester 0fe5dcd2f2
Merge pull request #695 from mistyhacks/update-service-port-syntax
Add info about new port mapping syntax
2017-11-16 17:36:44 +01:00
Misty Stanley-Jones 9ef7caa6fe Add info about new port mapping syntax
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-11-15 17:58:13 -08:00
Sebastiaan van Stijn 9022ea549d
Merge pull request #693 from eiais/e2e
Add e2e testing for Trust revoke
2017-11-15 20:39:53 +01:00
Sebastiaan van Stijn 801ddee343
Merge pull request #671 from dnephin/remove-secret-config-duplication
Remove secret/config duplication in cli/compose
2017-11-15 19:29:39 +01:00
Sebastiaan van Stijn 026c6db6f6
Merge pull request #74 from jamiehannaford/until-logging
Add new CLI option for --until
2017-11-14 18:49:46 +01:00