499d1359a4
Merge pull request #730 from BretFisher/729-fix-zsh-node-and-stack-names
...
Fixing zsh column finding in nodes and stacks.
Upstream-commit: 143f9f0336
2017-12-06 16:03:20 -08:00
9d2c3018e2
Merge pull request #733 from thaJeztah/sync-runc
...
Bump runc to b2567b37d7b75eb4cf325b77297b140ea686ce8f
Upstream-commit: ddec67c34e
2017-12-06 16:46:33 -05:00
dced91d6f0
Merge pull request #734 from shin-/schema_35_build_shm_size
...
Add shm_size property to build configuration in Compose schema
Upstream-commit: 4a4db7f20c
2017-12-06 13:35:14 -08:00
f0f2c2b953
Add missing additionalProperties marker on mount definitions
...
Signed-off-by: Joffrey F <joffrey@docker.com >
Upstream-commit: 88bbaca294
2017-12-06 12:37:38 -08:00
31d8edcd80
Add shm_size property to build configuration in Compose schema
...
Signed-off-by: Joffrey F <joffrey@docker.com >
Upstream-commit: e49f14cf36
2017-12-06 12:34:12 -08:00
c9781de504
Bump runc to b2567b37d7b75eb4cf325b77297b140ea686ce8f
...
To match what's used in Moby
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 669b8507be
2017-12-06 11:09:36 -08:00
0aafcdcf36
Merge pull request #732 from ndeloof/8917
...
closes #8917 introduce `—workdir` option for docker exec
Upstream-commit: 86653f4d57
2017-12-06 10:51:33 -08:00
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
7b947af7df
update docker/docker for ExecConfig WorkingDir support
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: 798ec76223
2017-12-06 19:04:42 +01:00
4a137d3ed6
Annotate worker option for 1.35 API
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: 8dc88ea7b5
2017-12-06 17:24:01 +01:00
d02e9392a1
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 >
Upstream-commit: da6b8cb5de
2017-12-06 17:24:01 +01:00
5deca4bbe1
introduce —workdir option for docker exec
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: 591a1273fd
2017-12-06 17:24:01 +01:00
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
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
a5a325a05f
Fixing zsh column finding in nodes and stacks.
...
Signed-off-by: Bret Fisher <bret@bretfisher.com >
Upstream-commit: 8b6d6fa974
2017-12-05 01:03:25 -05:00
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
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
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
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
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
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
02055337d8
Merge pull request #694 from riyazdf/trust-inspect
...
docker trust inspect
Upstream-commit: d921d5cc39
2017-11-29 11:33:53 -08:00
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
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
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
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
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
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
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
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
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
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
