Commit Graph

4840 Commits

Author SHA1 Message Date
Daniel Nephin 9da2602f38 Fix external networks
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-12-11 11:29:49 -05:00
Vincent Demeester 29d3510d50
Merge pull request #741 from thaJeztah/bump-version
Bump version to 18.01-dev
2017-12-08 09:04:04 +01:00
Sebastiaan van Stijn c4875264a3
Bump version to 18.01-dev
The 17.12.0-rc1 release was cut-off from commit
ace5417954

This patch bumps the version to 18.01-dev to
indicate that any change is now for the upcoming
18.01 release.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-12-07 13:58:06 -08:00
Victor Vieux ace5417954
Merge pull request #736 from tiborvass/platform-version
Add platform and its components to docker version output
2017-12-06 17:31:05 -08:00
Brian Goff 7138d6e301 Sort component details in template
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-12-07 02:04:10 +01:00
Tibor Vass 5f4c5f8bb6 Add platform and its components to docker version output
The Server section of version output is now composed of an Engine
component and potentially more, based on what the /version endpoint
returns.

Signed-off-by: Tibor Vass <tibor@docker.com>
2017-12-07 02:04:10 +01:00
Tibor Vass fe3941af7d vendor moby api to get new version types
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-12-07 02:04:10 +01:00
Sebastiaan van Stijn 8053cf67e0
Merge pull request #726 from albers/completion-log-opt-line-only
Add bash completion for `--log-opt line-only`
2017-12-06 16:04:26 -08:00
Sebastiaan van Stijn 143f9f0336
Merge pull request #730 from BretFisher/729-fix-zsh-node-and-stack-names
Fixing zsh column finding in nodes and stacks.
2017-12-06 16:03:20 -08:00
Brian Goff ddec67c34e
Merge pull request #733 from thaJeztah/sync-runc
Bump runc to b2567b37d7b75eb4cf325b77297b140ea686ce8f
2017-12-06 16:46:33 -05:00
Sebastiaan van Stijn 4a4db7f20c
Merge pull request #734 from shin-/schema_35_build_shm_size
Add shm_size property to build configuration in Compose schema
2017-12-06 13:35:14 -08:00
Joffrey F 88bbaca294 Add missing additionalProperties marker on mount definitions
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 12:37:38 -08:00
Joffrey F e49f14cf36 Add shm_size property to build configuration in Compose schema
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 12:34:12 -08:00
Sebastiaan van Stijn 669b8507be
Bump runc to b2567b37d7b75eb4cf325b77297b140ea686ce8f
To match what's used in Moby

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-12-06 11:09:36 -08:00
Sebastiaan van Stijn 86653f4d57
Merge pull request #732 from ndeloof/8917
closes #8917 introduce `—workdir` option for docker exec
2017-12-06 10:51:33 -08:00
Sebastiaan van Stijn 30755cf340
Merge pull request #711 from dnephin/compose-add-name-to-network
Support network.name in the compose schema
2017-12-06 10:44:03 -08:00
Nicolas De Loof 798ec76223
update docker/docker for ExecConfig WorkingDir support
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2017-12-06 19:04:42 +01:00
Nicolas De Loof 8dc88ea7b5
Annotate worker option for 1.35 API
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2017-12-06 17:24:01 +01:00
Nicolas De Loof da6b8cb5de
Because the option takes an argument, a special treatment is required in the preceding case
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2017-12-06 17:24:01 +01:00
Nicolas De Loof 591a1273fd
introduce `—workdir` option for docker exec
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2017-12-06 17:24:01 +01:00
Daniel Nephin d0b8aa7701 Support network.name in the compose schema.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-12-06 10:05:24 -05:00
Sebastiaan van Stijn ea854237aa
Merge pull request #724 from dungeonmaster18/723-auto-complete-command
Added auto complete command for fluentd-sub-second-precision.
2017-12-05 10:29:39 -08:00
Bret Fisher 8b6d6fa974 Fixing zsh column finding in nodes and stacks.
Signed-off-by: Bret Fisher <bret@bretfisher.com>
2017-12-05 01:03:25 -05:00
Sebastiaan van Stijn 83cdc0f1bd
Merge pull request #704 from albers/completion--platform
Add bash completion for `--platform`
2017-12-04 13:19:37 -08:00
Harald Albers 0798d71f38 Add bash completion for `--log-opt line-only`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-12-04 10:05:37 +01:00
dungeonmaster18 d5271568a2
Added auto complete command for fluentd-sub-second-precision
Signed-off-by: dungeonmaster18 <umesh4257@gmail.com>
2017-12-01 18:39:41 +05:30
Victor Vieux 6b63d7b96a
Merge pull request #719 from vdemeester/test-secret-config-indempotence
Add unit tests on config/secret indempotence in stack deploy
2017-11-30 08:39:56 -08:00
Vincent Demeester 5ed399e588
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>
2017-11-30 09:45:32 +01:00
Vincent Demeester b45a49c83f
Merge pull request #702 from albers/completion-log--until
Add bash completion for `logs --until`
2017-11-30 09:40:08 +01:00
Harald Albers 15f78417b9 Add bash completion for `--platform`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-11-30 09:29:15 +01:00
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