Kenfe-Mickael Laventure
0311ed7b1c
Update containerd to version aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-01-31 15:01:55 -08:00
Anusha Ragunathan
c7f27f8c07
Add docs for service create based on plugins.
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
(cherry picked from commit 62d399e811
2017-01-31 12:55:45 -08:00
Joffrey F
171745b261
Fix typo in swagger.yaml for NetworkPrune operation
...
Signed-off-by: Joffrey F <joffrey@docker.com>
(cherry picked from commit 20c5fa3758
2017-01-31 12:55:19 -08:00
Harald Albers
73b9bdc6cb
Add bash completion for docker service logs
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 105231556a
2017-01-31 12:54:57 -08:00
Felix Abecassis
10d999d7ab
install: map debian_version 9.X to debian stretch
...
Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
(cherry picked from commit ac3d74b0b4
2017-01-31 12:54:34 -08:00
Alexander Morozov
ee1b5c5944
Merge pull request #30579 from yongtang/1.13.x
...
[1.13.x] Cherry-pick SwarmKit update to 0af40501a9cc98cd3e9425d2e4246dd3eff5526e
2017-01-31 12:31:15 -08:00
Victor Vieux
c4d731c24c
Merge pull request #30577 from justincormack/arm-seccomp-1.13
...
[1.13.x] Add two arm specific syscalls to seccomp profile
2017-01-30 17:15:27 -08:00
Yong Tang
1e0179589d
[1.13.x] Cherry-pick SwarmKit update to 0af40501a9cc98cd3e9425d2e4246dd3eff5526e
...
This fix cherry-pick SwarmKit update to 0af40501a9cc98cd3e9425d2e4246dd3eff5526e
for branch 1.13.x. The following has been added:
- [docker/swarmkit#1909]: raft: Disable address change detection
- [docker/swarmkit#1910]: Fix issue in service update of published ports in host mode
This fix fixes #30199 in docker.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-01-30 15:22:48 -08:00
Justin Cormack
c1c5d30ee4
[1.13.x] Add two arm specific syscalls to seccomp profile
...
cherry pick #30545
These are arm variants with different argument ordering because of
register alignment requirements.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-30 23:01:28 +00:00
Victor Vieux
2527cfcc49
Merge pull request #30515 from vieux/1.13.1-rc1-changelog
...
bump to 1.13.1-rc1
2017-01-27 13:10:39 -08:00
Victor Vieux
de6c83de28
Merge pull request #30494 from vieux/cherry-pick-secrets-compose
...
[1.13.x] cherry-pick secrets to compose
2017-01-27 13:10:31 -08:00
Victor Vieux
e84317c735
bump to 1.13.1-rc1
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2017-01-27 11:46:09 -08:00
allencloud
e25c046488
update incorrect url in docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 5ae95d6245
2017-01-27 11:32:10 -08:00
Sebastiaan van Stijn
749f8bfee8
document DOCKER_HIDE_LEGACY_COMMANDS env-var
...
The `DOCKER_HIDE_LEGACY_COMMANDS` environment
variable was added in a7c8bcac2b2ef82fd237
2017-01-27 11:31:55 -08:00
Lars-Magnus Skog
bdc5b347f5
update api docs on Placement.Constraints for services
...
Signed-off-by: Lars-Magnus Skog <ralphtheninja@riseup.net>
(cherry picked from commit 9c98bffc2b
2017-01-27 11:31:34 -08:00
Janonymous
370e8f25d2
Fix json format of plugin
...
Signed-off-by: Janonymous <janonymous.codevulture@gmail.com>
(cherry picked from commit 2d24dbe896
2017-01-27 11:31:20 -08:00
Harald Albers
e0c79df37d
Add [OPTIONS] to usage of plugin disable|push
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit aad095f573
2017-01-27 11:30:37 -08:00
Victor Vieux
e3441eb64c
Merge pull request #30513 from mstanleyjones/1.13.x
...
Cherry-pick #30478 to 1.13.x
2017-01-27 11:10:08 -08:00
Victor Vieux
8d0198c59d
fix cherry-pick
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2017-01-27 11:09:43 -08:00
Misty Stanley-Jones
ed7aea3533
Merge pull request #30478 from mstanleyjones/fix_broken_links
...
Fix broken relative links in old API docs
(cherry picked from commit 05d4c1314e
2017-01-27 09:48:48 -08:00
Victor Vieux
1b05e7aee7
Merge pull request #30331 from vieux/1.13.1-rc1-cherrypicks
...
1.13.1 rc1 cherrypicks
2017-01-26 19:21:38 -08:00
Victor Vieux
c5147e6ab5
Merge pull request #30467 from mavenugo/1.13-lncp
...
Vendoring libnetwork 2c8b683
2017-01-26 10:56:58 -08:00
Josh Hawn
692c98895f
Add SecretUpdate docs to api/swagger.yaml
...
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
(cherry picked from commit 1cd5af59bf
2017-01-26 06:38:32 -08:00
Josh Hawn
4dc1b6221d
Add SecretUpdate method to client
...
closes #28678
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Update cli/command/service/update_test.go
Fixes test build error:
secretAPIClientMock does not implement "github.com/docker/docker/client".SecretAPIClient (missing SecretUpdate method)
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
(cherry picked from commit 77b8465d7e
2017-01-26 06:38:25 -08:00
Daniel Nephin
1afa22733c
Set default values for uid and gid to prevent errors when starting a service.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 167b3f95b7
2017-01-26 06:21:01 -08:00
Daniel Nephin
c19f50acef
Rebase Compose v3.1 schema on the latest v3 schema.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit b4f23bbc69
2017-01-26 06:20:55 -08:00
Daniel Nephin
6b70c68a7c
Remove secrets as part of stack remove.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit f0a5531c46
2017-01-26 06:20:49 -08:00
Daniel Nephin
909014d324
Test and fix external secrets in stack deploy.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit b3427e43ed
2017-01-26 06:20:36 -08:00
Daniel Nephin
1fed3349fb
Add integration test for stack deploy with secrets.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 6ec84ef76d
2017-01-26 06:20:26 -08:00
Daniel Nephin
2f445705f9
Implement secret types for compose file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 9419e7df2b
2017-01-26 06:19:49 -08:00
Daniel Nephin
118e55df62
Add v3.1 schema and support validating multiple version.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 65374488f9
2017-01-26 06:18:26 -08:00
Madhu Venugopal
e6f89d1af5
Vendoring libnetwork 2c8b683
...
to address #30295
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2017-01-26 04:38:21 -08:00
Alessandro Boch
819bcf8182
Remove attachable network on swarm leave
...
- When the node leaves the cluster, if any user run
container(s) is connected to the swarm network,
then daemon needs to detach the container(s) and
remove the network.
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit 3cedca5d53
2017-01-26 04:31:34 -08:00
Sebastiaan van Stijn
3fc246ded2
Merge pull request #29732 from vdemeester/29676-deploy-indempotent
...
[1.13.x] Make docker stack deploy a little bit more idempotent
2017-01-26 12:47:23 +01:00
Victor Vieux
426c4cb747
Merge pull request #30452 from dnephin/cherry-compose-refactor
...
Compose fixes for 1.13.1
2017-01-26 00:47:42 -08:00
Michael Irwin
017381aea4
Fixed secret creation usage during service create in docs
...
Using source, the following error is made:
invalid field in secret request: src
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
(cherry picked from commit 9250117d58
2017-01-25 22:17:04 -08:00
Sebastiaan van Stijn
214f42d541
Add "src" alias for --secret
...
This patch adds a "src" alias for `--secret`
to be consistent with `--mount`.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 950658bbb6
2017-01-25 22:16:32 -08:00
Yong Tang
a64c9357ca
Fix incorrect Scope in network ls/inspect with duplicate network names
...
This fix tries to address the issue raised in 30242 where the `Scope`
field always changed to `swarm` in the ouput of `docker network ls/inspect`
when duplicate networks name exist.
The reason for the issue was that `buildNetworkResource()` use network name
(which may not be unique) to check for the scope.
This fix fixes the issue by always use network ID in `buildNetworkResource()`.
A test has been added. The test fails before the fix and passes after the fix.
This fix fixes 30242.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 05a831a775
2017-01-25 22:13:13 -08:00
Darren Stahl
e7077f7d26
Windows: Add service dependency ConDrv
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
(cherry picked from commit b2a7f6abb3
2017-01-25 21:37:54 -08:00
Victor Vieux
328775ea4f
removing trailing backslash in zsh completion
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2017-01-25 20:35:42 -08:00
Vincent Demeester
bf43d2a58d
Make docker stack deploy a little bit more indempotent
...
Sort some slice fields before sending them to the swarm api so that it
won't trigger an update.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-01-25 20:31:09 -08:00
John Howard
6a9670b044
Windows: Bump to latest version of git
...
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit 8a45eea2dd
2017-01-25 20:07:49 -08:00
Christopher Jones
53576a5bf9
[ppc64le] use official go 1.7.4 binaries
...
go 1.7.4 introduced official go ppc64le binaries, so use those
instead of using older versions of go and building from src.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
(cherry picked from commit 62ab6809bd
2017-01-25 20:07:09 -08:00
Christopher Jones
6b4a835431
[project] bump go to go 1.7.4
...
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
(cherry picked from commit 20e243780e
2017-01-25 20:06:06 -08:00
Daniel Nephin
92155e37b3
Add missing network.internal.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-25 16:43:05 -05:00
Daniel Nephin
7f396e8ea3
Update Compose schema to match docker-compose.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-25 16:43:05 -05:00
Daniel Nephin
d9bda3080a
Add validation for compose schema bindata.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-25 16:43:05 -05:00
Daniel Nephin
007e492eac
Add deps to test compose-file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-25 16:43:05 -05:00
Daniel Nephin
6bc7bc19df
Fix some bad merges
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-25 16:43:02 -05:00
Tibor Vass
cbe6781501
plugins: add example docs for a rexray plugin
...
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 5f713cecc5
2017-01-25 13:31:51 -08:00
