lixiaobing10051267
33b6dcd341
expected new_container_id while testing ContainerCommit
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: e98be4c62f
2016-11-18 10:21:04 +08:00
Sebastiaan van Stijn
021e1a51ce
Merge pull request #28322 from Microsoft/jjh/api1.26
...
Bump API to v1.26
Upstream-commit: 6e6b37b0a2
2016-11-17 00:01:46 +01:00
John Howard
b930443d65
Bump API to v1.26
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b5b095c01a
2016-11-14 14:24:02 -08:00
wefine
27d5ed0e7a
fix t.Errorf to t.Error in serveral _test.go
...
Signed-off-by: wefine <wang.xiaoren@zte.com.cn >
Upstream-commit: 2eb3e2ce0f
2016-11-14 17:54:43 +08:00
Vincent Demeester
608f23172f
Add reference filter and deprecated filter param…
...
… for `docker images`.
This deprecates the `filter` param for the `/images` endpoint and make a
new filter called `reference` to replace it. It does change the CLI
side (still possible to do `docker images busybox:musl`) but changes the
cli code to use the filter instead (so that `docker images --filter
busybox:musl` and `docker images busybox:musl` act the same).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 85e72de60c
2016-11-11 15:34:01 +01:00
Victor Vieux
75859b8297
Merge pull request #28217 from Microsoft/jjh/373engineapifollowup
...
Tidy GetDockerOS() function
Upstream-commit: dc4d7a83ff
2016-11-10 18:57:56 -08:00
Victor Vieux
a867bf217d
move plugins out of experimental
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 1f6f5bec49
2016-11-10 15:51:32 -08:00
Andrea Luzzardi
915d9ab391
api: Service Logs support
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: f88c041647
2016-11-10 13:46:02 -08:00
Victor Vieux
557c959fcf
Merge pull request #28164 from anusha-ragunathan/plugin-build
...
Add plugin create functionality.
Upstream-commit: 98408aa5c8
2016-11-09 17:49:51 -08:00
Aaron Lehmann
b9674ce3e8
Add unlock key rotation
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: de1b8f9439
2016-11-09 16:09:01 -08:00
Aaron Lehmann
50e796a0be
Revise swarm init/update flags, add unlocking capability
...
- Neither swarm init or swarm update should take an unlock key
- Add an autolock flag to turn on autolock
- Make the necessary docker api changes
- Add SwarmGetUnlockKey API call and use it when turning on autolock
- Add swarm unlock-key subcommand
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: a8dc2ff916
2016-11-09 16:09:00 -08:00
Tonis Tiigi
798fd349f4
Add support for swarm init lock and swarm unlock
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: dd81022c23
2016-11-09 16:09:00 -08:00
Anusha Ragunathan
7c006ff288
Add plugin create functionality.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 3d7a95829e
2016-11-09 15:23:03 -08:00
John Howard
4931dad259
Tidy GetDockerOS() function
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c941751fb2
2016-11-09 14:46:53 -08:00
Evan Hazlett
8788cdab0b
review updates
...
- use Filters instead of Filter for secret list
- UID, GID -> string
- getSecrets -> getSecretsByName
- updated test case for secrets with better source
- use golang.org/x/context instead of context
- for grpc conversion allocate with make
- check for nil with task.Spec.GetContainer()
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: ab6c38e014
2016-11-09 14:27:45 -05:00
Evan Hazlett
719ce57b9e
more review updates
...
- use /secrets for swarm secret create route
- do not specify omitempty for secret and secret reference
- simplify lookup for secret ids
- do not use pointer for secret grpc conversion
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 548728bb84
2016-11-09 14:27:43 -05:00
Evan Hazlett
d1a4dc8e90
secrets: secret management for swarm
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
wip: use tmpfs for swarm secrets
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
wip: inject secrets from swarm secret store
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
secrets: use secret names in cli for service create
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
switch to use mounts instead of volumes
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
vendor: use ehazlett swarmkit
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
secrets: finish secret update
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 72ff77999c
2016-11-09 14:27:43 -05:00
Victor Vieux
10e4d1c58c
always add but hide experimental cmds and flags
...
Signed-off-by: Victor Vieux <vieux@docker.com >
update cobra and use Tags
Signed-off-by: Victor Vieux <vieux@docker.com >
allow client to talk to an older server
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 4f63bfb619
2016-11-08 04:55:27 -08:00
Victor Vieux
d8d857d3a5
support settings in docker plugins install
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 3f7264473d
2016-11-07 22:49:22 -08:00
Antonio Murdaca
1fb5d053e7
client: bump default version to v1.25
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 58c2d938dd
2016-11-07 10:01:28 +01:00
Vincent Demeester
832f1884c2
Merge pull request #28065 from lixiaobing10051267/masterServerEror
...
add error information to distinguish different test scene
Upstream-commit: c910d3825b
2016-11-07 09:16:16 +01:00
lixiaobing10051267
792c7e5a54
add error information to distinguish different test scene
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: a98c89b310
2016-11-04 17:16:11 +08:00
Antonio Murdaca
f70d6e5d9c
daemon: add a flag to override the default seccomp profile
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 485bb69238
2016-11-02 21:41:29 +01:00
Sebastiaan van Stijn
5d177d55f0
Merge pull request #27948 from WeiZhang555/consistent-filters
...
Replace all "Filter" field with "Filters" for consistency
Upstream-commit: 732006e113
2016-11-02 00:53:15 -07:00
Zhang Wei
c7196b3968
Replace all "Filter" field with "Filters" for consistency
...
In file `api/types/client.go`, some of the "*Options{}" structs own a
`Filters` field while some else have the name of `Filter`, this commit
will rename all `Filter` to `Filters` for consistency. Also `Filters`
is consistent with API with format `/xxx?filters=xxx`, that's why
`Filters` is the right name.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: d121e14ccd
2016-11-01 23:09:30 +08:00
Daniel Nephin
7d5d39c4f3
Refactor client/request
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5f066ed250
2016-10-31 17:36:49 -04:00
Daniel Nephin
fe94d78afa
Generate ContainerWait response from the swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 85a0bd062d
2016-10-31 11:19:53 -04:00
Daniel Nephin
e10d258b88
generate AuthResponse type from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ca7404a80a
2016-10-31 11:16:03 -04:00
Daniel Nephin
4a62b2cc8e
Generate container update response from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 598e3a4874
2016-10-31 11:16:02 -04:00
Daniel Nephin
bc55ba3a44
Use IDResponse for container create response.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f8cdc5ae71
2016-10-31 11:16:02 -04:00
Daniel Nephin
71efaf6beb
Add an IDResponse type
...
Generated from a swagger spec and use it for container exec response
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: d4d914bd52
2016-10-31 11:16:02 -04:00
Daniel Nephin
9557c883f5
Generate container create response from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e0f7f8d0dd
2016-10-31 11:16:02 -04:00
Daniel Nephin
d817915a4e
Use a config to generate swagger api types
...
Moves the resposne types to a package under api/types
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6dc945ab36
2016-10-31 11:13:41 -04:00
Daniel Nephin
6fb78dfac2
Generate VolumesCreateRequest from the swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 0325c474b8
2016-10-31 11:13:41 -04:00
Daniel Nephin
daa7c9a587
Generate VolumeList response from the swagger spec
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3e13296c4e
2016-10-31 11:13:41 -04:00
Michael Crosby
831fa2006f
Merge pull request #27394 from Microsoft/jjh/runelevated
...
Windows: Hint to run client elevated
Upstream-commit: e9089b55ee
2016-10-28 11:25:04 -07:00
boucher
40e9e05c74
Allow providing a custom storage directory for docker checkpoints
...
Signed-off-by: boucher <rboucher@gmail.com >
Upstream-commit: a38761aba4
2016-10-28 07:56:05 -04:00
Kenfe-Mickaël Laventure
dbd3d8d8d3
Merge pull request #26718 from ncdc/add-logs-to-container-attach-options
...
Add Logs to ContainerAttachOptions
Upstream-commit: 4c7160ed7b
2016-10-27 13:32:50 -07:00
Tibor Vass
d6afd26ba8
Merge pull request #26402 from qudongfang/ensure_client_transport_be_closed
...
ensure transport.Client be closed
Upstream-commit: 49fa58a2e9
2016-10-26 11:51:51 -07:00
Sebastiaan van Stijn
e2164724b1
Merge pull request #27702 from tonistiigi/net-builder0
...
add --network option for docker build
Upstream-commit: 70fbc5e0bb
2016-10-25 21:50:33 -07:00
sandyskies
1ba89e2590
add --network option for docker build
...
Signed-off-by: sandyskies <chenmingjie0828@163.com >
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 01832cc0ab
2016-10-25 10:25:36 -07:00
Akihiro Suda
2cd2223423
add docker network prune
...
`docker network prune` prunes unused networks, including overlay ones.
`docker system prune` also prunes unused networks.
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 171e533ba2
2016-10-25 06:43:54 +00:00
Kenfe-Mickael Laventure
c2195d43eb
Make experimental a runtime flag
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 31f5d9b543
2016-10-24 15:20:01 -07:00
Daniel Nephin
ca3b5155d5
Generate api/types:Image from the swagger spec
...
and rename it to a more appropriate name ImageSummary.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a6a247fdf9
2016-10-20 13:24:23 -07:00
Andy Goldstein
731dd426a8
Add Logs to ContainerAttachOptions
...
Signed-off-by: Andy Goldstein <agoldste@redhat.com >
Upstream-commit: 27bab36800
2016-10-19 11:39:00 -04:00
Aaron Lehmann
58b052f94e
API changes for service rollback and failure threshold
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 671fe5c051
2016-10-18 10:09:30 -07:00
John Howard
9315c00769
Windows: Hint to run client elevated
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8632280315
2016-10-14 10:42:04 -07:00
Stephen J Day
1409d06aeb
client: deterministically resolve http scheme
...
The docker client has historically used Transport.TLSClientConfig to set
the scheme for the API client. A recent moved the resolution to use the
http.Transport directly, rather than save the TLSClientConfig state on a
client struct. This caused issues when mutliple calls made with a single
client would have this field set in the http package on pre-1.7
installations. This fix detects the presence of the TLSClientConfig once
and sets the scheme accordingly.
We still don't know why this issue doesn't happen with Go 1.7 but it
must be more deterministic in the newer version.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 4d1a6a43cd
2016-10-11 15:53:14 -07:00
Aaron Lehmann
be553ef1f7
Merge pull request #26804 from stevvooe/clear-tlsconfig-unix-socket
...
client: pedantic checking of tlsconfig
Upstream-commit: bc55f969b0
2016-10-11 15:47:47 -07:00
Sebastiaan van Stijn
6aa28a8fc2
Merge pull request #27232 from bfirsh/godoc-client
...
Add GoDoc for client package
Upstream-commit: 0594aa6ac2
2016-10-10 23:25:34 +02:00
