Laura Frank
68afbb36f4
Updating aws-sdk-go to version 1.4.22
...
Signed-off-by: Laura Frank <ljfrank@gmail.com >
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: ba4e0c328f96e6a6caa6c67e3ee4d446d75a584f
Component: engine
2016-10-31 09:23:45 -07:00
Brian Goff
cc1e62247e
Merge pull request #27782 from tombooth/27779-decouple-watcher-close
...
Decouple removing the fileWatcher from reading
Upstream-commit: 0cdcb9ea7350b1e0a024bf40c8cf60e541f2c69f
Component: engine
2016-10-31 11:50:26 -04:00
Daniel Nephin
fe94d78afa
Generate ContainerWait response from the swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 85a0bd062d
Component: cli
2016-10-31 11:19:53 -04:00
Daniel Nephin
2c5782817e
Generate ContainerWait response from the swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 181562c2e54225d6ce737d98b03d3157451a5dbc
Component: engine
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
Component: cli
2016-10-31 11:16:03 -04:00
Daniel Nephin
bc7bcb9601
generate AuthResponse type from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 2732b8a9bb3edb92121d0b0dcc144e5f557e2fbf
Component: engine
2016-10-31 11:16:03 -04:00
Daniel Nephin
5175d100a2
Generate container create response from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e7e0837702
Component: cli
2016-10-31 11:16:02 -04:00
Daniel Nephin
4a62b2cc8e
Generate container update response from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 598e3a4874
Component: cli
2016-10-31 11:16:02 -04:00
Daniel Nephin
1b85879c03
Generate container update response from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f196cf6a090556ccb42198043a71d133482b510d
Component: engine
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
Component: cli
2016-10-31 11:16:02 -04:00
Daniel Nephin
1759ab5e8b
Use IDResponse for container create response.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c8d5e7203e1ae140a5cca312b6699063b521cf83
Component: engine
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
Component: cli
2016-10-31 11:16:02 -04:00
Daniel Nephin
01541139a5
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: 01883c136d9ef06962d80aa81e27d1d90eb6d199
Component: engine
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
Component: cli
2016-10-31 11:16:02 -04:00
Daniel Nephin
913e9a48c1
Generate container create response from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: bad849fc826b410c3aeb753a8c7f6b38f7ae12b0
Component: engine
2016-10-31 11:16:02 -04:00
Daniel Nephin
1dc49df012
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: 010023c3c6
Component: cli
2016-10-31 11:13:41 -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
Component: cli
2016-10-31 11:13:41 -04:00
Daniel Nephin
dc10e9a664
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: 29df3bdb117a058ae040686dd0f2565ae9ad743a
Component: engine
2016-10-31 11:13:41 -04:00
Daniel Nephin
f382f98092
Generate VolumesCreateRequest from the swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 120c5f9964
Component: cli
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
Component: cli
2016-10-31 11:13:41 -04:00
Daniel Nephin
52c74e2725
Update to inline comments.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 8f81bb92a3e528d0b5facadd55738aefc279caf8
Component: engine
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
Component: cli
2016-10-31 11:13:41 -04:00
Daniel Nephin
b705a36179
Cleanup network swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 52a4737319b4008a0b636319905e2bfc7b3225ad
Component: engine
2016-10-31 11:13:41 -04:00
Daniel Nephin
d19255532a
Generate VolumesCreateRequest from the swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5c2498fd3c41f4badb1788665886d30772537f73
Component: engine
2016-10-31 11:13:41 -04:00
Daniel Nephin
fa3a1f0666
Generate ErrorResponse struct from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: bc757385455dee272ca563031afece05c935320b
Component: engine
2016-10-31 11:13:41 -04:00
Daniel Nephin
914619c6f3
Cleanup volume swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 84a39c0830a3c9fa91d65db201ed9a925af7bfe6
Component: engine
2016-10-31 11:13:41 -04:00
Daniel Nephin
31c5c30bb3
Generate VolumeList response from the swagger spec
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: d459e83b1c993d63d5f94b85a7f8ddf3ac01beae
Component: engine
2016-10-31 11:13:41 -04:00
Wentao Zhang
2f34129ae0
fix volume driver deletions prevents recreation of volume issue
...
Signed-off-by: Wentao Zhang <zhangwentao234@huawei.com >
Upstream-commit: 64d0592d41e96ac5c522c21d9270485e72c80231
Component: engine
2016-10-31 10:24:29 -04:00
Christopher Jones
6d5a2dc4f9
Fix install script for multiarch
...
The current check for uname -m just looks for *64 which hits a lot
more cases than it should (mips for ex), and ignores a few that it shouldn't.
This check will run the install script if on a supported architecture
(x86_64 or amd64) or an unofficial one with a docker repository
(armv6l or armv7l) and will give a more accurate error on an unofficial
64-bit architecture that isn't in the docker repository.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 28bdf08e0a13c34d765b5db90b552ed6fc3fd459
Component: engine
2016-10-31 09:38:26 -04:00
Boaz Shuster
5209994e39
Validate docker-load receives a tar file
...
To load an image from a tar file, you can specify
the tar file in the -i/--input option:
docker load -i image_1.tar
or using stdin:
docker load < image_1.tar
cat image_1.tat | docker load
If the image file isn't given the `docker load`
command gets stuck.
To avoid that, the load makes sure the CLI input is
not a terminal or the `--input` option was set.
If not then an error message is shown.
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 4426189b35aee4a64bedfb48604ad342a3a5b946
Component: engine
2016-10-31 15:30:55 +02:00
Boaz Shuster
f73b440c5c
Validate docker-load receives a tar file
...
To load an image from a tar file, you can specify
the tar file in the -i/--input option:
docker load -i image_1.tar
or using stdin:
docker load < image_1.tar
cat image_1.tat | docker load
If the image file isn't given the `docker load`
command gets stuck.
To avoid that, the load makes sure the CLI input is
not a terminal or the `--input` option was set.
If not then an error message is shown.
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: fdbf29e1fa
Component: cli
2016-10-31 15:30:55 +02:00
yuexiao-wang
613dd5861e
Modify short and flags for docker inspect
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: cc03984e17f77ce1ad3f41e815a616405b6ffc76
Component: engine
2016-10-31 18:11:25 +08:00
yuexiao-wang
0473c568d7
Modify short and flags for docker inspect
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 6027424adf
Component: cli
2016-10-31 18:11:25 +08:00
John Howard
27e4d0d0fb
Windows: Fix COPY file . after WORKDIR
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f0b93b6ed8b4c0776065be972b4d5b4611f25fbf
Component: engine
2016-10-30 13:12:27 -07:00
Madhu Venugopal
11be31b1b8
Copy only the relevant endpoint configs from Attachable config
...
When a container is run on a --attachable network, the endpoint
configs passed by the user were incorrectly overwritten.
Copy the relevant configs instead of overwriting the entire configs.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: c5dd4d70c6ea3371d61409112a45c0573280111d
Component: engine
2016-10-29 17:11:30 -07:00
Vincent Demeester
d375460d63
Merge pull request #27879 from sdurrheimer/zsh-completion-ps-health-filter
...
Add zsh completion for 'docker ps --filter health='
Upstream-commit: 17aaa0890a7f53cbd9c8806a93de73898ea92813
Component: engine
2016-10-29 19:23:55 +02:00
Sebastiaan van Stijn
596b96c39e
Merge pull request #27881 from albers/completion-ps--filter-health
...
Add bash completion for `docker ps --filter health`
Upstream-commit: e1369f2f394bde84f9d0a3b262a9ce94971e039b
Component: engine
2016-10-29 10:05:24 -07:00
Doug Davis
d4dfe8f046
Merge pull request #27878 from hqhq/fix_typos
...
Fix bunch of typos
Upstream-commit: 72ec0f3488324e1cd622b78e3ea746981f558b60
Component: engine
2016-10-29 07:50:45 -04:00
Harald Albers
4011d7083d
Add bash completion for docker ps --filter health
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 5e6a59b59f567d5e69d9ae9df98a89a69b2664bd
Component: engine
2016-10-29 04:26:08 -07:00
Steve Durrheimer
1fda59702c
Add zsh completion for 'docker ps --filter health='
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 8df3d6a2a7e02ff1c7baf0a273d20b2422e38f39
Component: engine
2016-10-29 12:13:29 +02:00
Qiang Huang
f6256ed04b
Fix bunch of typos
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: faac177285
Component: cli
2016-10-29 15:03:26 +08:00
Qiang Huang
34bac6f06e
Fix bunch of typos
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: e6866492c4492db3bb9546afa2fbaed20f4c1883
Component: engine
2016-10-29 15:03:26 +08:00
Vincent Demeester
0be42defbd
Merge pull request #24698 from jhorwit2/jah/clist-health-filter-format
...
Fixes #24022 - Adds container health support to docker ps filter/format
Upstream-commit: 515e5dade7a006dbd2c42880f1af695da22ece60
Component: engine
2016-10-29 06:56:06 +02:00
Sebastiaan van Stijn
d85153c870
Merge pull request #27874 from duglin/addComment
...
Add a comment about how we don't mkdir during WORKDIR directly
Upstream-commit: 507b4e9e4aed26170802b2691e47c59b2c6cf403
Component: engine
2016-10-28 21:03:47 -07:00
Doug Davis
0d12f299cb
Add a comment about how we don't mkdir during WORKDIR directly
...
Just to help the next time someone goes looking for it while debugging.
Like @jhowardmsft and I did while looking at #27545 .
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 9f79043a63302258a597a69b0c5ec5e09a480ac0
Component: engine
2016-10-28 19:24:37 -07:00
Vincent Demeester
4e9b278e51
Merge pull request #27840 from estesp/add-userns-status-to-info
...
Add "userns" to `docker info` security options output
Upstream-commit: 1fb9c4e89188f48c79889f6128fdec865bed467d
Component: engine
2016-10-29 02:58:34 +02:00
Sebastiaan van Stijn
ed6994ddbe
Merge pull request #27844 from LK4D4/fix_build_rpm
...
project: fix build rpm
Upstream-commit: cff976a0b8a52ff2baee3f3cc503276862278153
Component: engine
2016-10-28 16:50:58 -07:00
Sebastiaan van Stijn
092d6f43e2
Merge pull request #27867 from Microsoft/jjh/difftest
...
Windows: Port a docker diff test
Upstream-commit: a0eae7e3c0e037f73445a4f77a4dfcd1042be75c
Component: engine
2016-10-28 16:44:03 -07:00
Sebastiaan van Stijn
e28a436d48
Merge pull request #26857 from thaJeztah/docs-add-missing-IPAM-options
...
docs: add missing IPAM options to API docs
Upstream-commit: a9753c333fe62ec761af8487a88da713451a0c36
Component: engine
2016-10-28 16:25:23 -07:00
Sebastiaan van Stijn
3b7e266f9c
docs: add missing IPAM options to API docs
...
Commit dd28ded711417c72d2e228d1ace129ac5fd05f19
brought in new networking features and API, but
did not document the available IPAM options.
This adds a description of those options.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d69fce79f94b807ccb0f2f64c47881ee8fc31250
Component: engine
2016-10-28 16:18:49 -07:00