yuexiao-wang
1917d3b958
add option and update the description
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-09-12 16:08:59 +08:00
Sven Dowideit
2cce7bf33a
Merge pull request #26306 from deployable/patch-1
...
Remote API documentation consistancy
2016-09-12 10:52:30 +10:00
Sven Dowideit
ae4582dc28
Merge pull request #26458 from sfsmithcha/fix_vip_diagram
...
updates swarm overlay network diagram
2016-09-12 10:11:08 +10:00
Madhu Venugopal
130db0a489
Merge pull request #26448 from michael-holzheu/PR-libnetwork-bump-to-fix-s390x-ci
...
Vendor libnetwork @51d88e9ae63f
2016-09-10 06:00:32 -07:00
Vincent Demeester
e6f76800f5
Merge pull request #26426 from sfsmithcha/carry_pry_25414
...
Carry pr 25414
2016-09-10 11:50:28 +02:00
Vincent Demeester
4c3f2e7c37
Merge pull request #26303 from yongtang/26300-docker-images-3-fractional-digits
...
Restrict size to 2 fractional digits for `docker images`
2016-09-10 11:32:45 +02:00
Matt Hoyle
e0a552504e
Keep headings consistant in API documentation
...
The "Stream details" sections are currently a part of the Status codes list.
This change moves them out to the same level as other surrounding sections.
Use () for a paramaters
Remove query param from end point heading
Signed-off-by: Matt Hoyle <matt@deployable.co>
2016-09-10 12:27:41 +10:00
Brian Goff
ebae43efc2
Merge pull request #26457 from aboch/auto
...
Add fallback to resolveSystemAddr() in linux
2016-09-09 20:46:29 -04:00
Charles Smith
e7e85c7e06
carries and closes 25414
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-09 15:57:53 -07:00
Charles Smith
48f3aa7805
updates swarm overlay network diagram
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-09 15:18:53 -07:00
Alessandro Boch
c0b24c600e
Add fallback to resolveSystemAddr() in linux
...
- So that swarm init will still work w/o specifying the advertise
address when the daemon is running inside a container
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-09-09 13:27:57 -07:00
Phil Estes
cf58eb437c
Merge pull request #22049 from boucher/docker-checkpoint-restore
...
Implement containerd API for checkpoints
2016-09-09 13:36:55 -04:00
root
7d8048de06
Vendor libnetwork @51d88e9ae63f
...
- Fixes #26440
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
2016-09-09 18:57:15 +02:00
Daniel Nephin
81090c9455
Merge pull request #26443 from dnephin/move_trust_client
...
Move image trust related cli methods into the image package
2016-09-09 12:29:28 -04:00
boucher
67f607a02f
Update checkpoint comments to be more accurate
...
Signed-off-by: boucher <rboucher@gmail.com>
2016-09-09 12:13:46 -04:00
John Howard
704049a691
Merge pull request #26438 from lixiaobing10051267/masterSystem
...
docker daemon requires windows version info while low build
2016-09-09 09:12:47 -07:00
Michael Crosby
c1f2776bf1
Merge pull request #26428 from darrenstahlmsft/AddToSymlink
...
Don't attempt to evaluate drive root on Windows
2016-09-09 09:09:24 -07:00
lixiaobing10051267
b4b9efd4c5
Specify the required version while the version not support daemon
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-09-09 23:04:45 +08:00
Daniel Nephin
e7c9694d76
Move image trust related cli methods into the image package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-09-09 10:50:16 -04:00
Brian Goff
89bc5d54ca
Merge pull request #26432 from stevvooe/dont-hide-context-errors
...
client: don't hide context errors
2016-09-09 08:53:43 -04:00
Justin Cormack
7c118f40cb
Merge pull request #26424 from michael-holzheu/PR-s390x-bump-to-binary-go-1-7-1
...
Dockerfile.s390x: Use binary go package
2016-09-09 09:53:02 +01:00
boucher
6bc9a2d563
Update containerd to fix unkillable restored containers.
...
Signed-off-by: boucher <rboucher@gmail.com>
2016-09-08 21:31:56 -04:00
boucher
0dfbf960d7
Fix the clashing route syntax for checkpoint/container delete.
...
Signed-off-by: boucher <rboucher@gmail.com>
2016-09-08 21:31:56 -04:00
boucher
cb0ad4258b
Fix typo
...
Signed-off-by: boucher <rboucher@gmail.com>
2016-09-08 21:31:56 -04:00
boucher
d8fef66b03
Initial implementation of containerd Checkpoint API.
...
Signed-off-by: boucher <rboucher@gmail.com>
2016-09-08 21:31:52 -04:00
Yong Tang
6866fda800
Revendor go-units to f2145db703495b2e525c59662db69a7344b00bb8
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-08 18:26:50 -07:00
Yong Tang
4e7e3919ce
Restrict size to 2 fractional digits for docker images
...
This fix tries to address the issue raised in 26300. Previously
`docker images` will use `HumanSize()` to display the size which
has a fixed precision of 4 (thus 3 fractional digits). This
could be problematic in certain languages (e.g. , German, see
26300) as `.` may be interpreted as thousands-separator in number.
This fix use `CustomSize()` instead and limit the precision to 3
(thus 2 fractional digits).
This fix has been tested manually.
This fix fixes 26300.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-08 18:26:50 -07:00
Stephen J Day
8e5ef8af5c
client: don't hide context errors
...
Instead of reformatting error from the request action, we wrap it,
allowing the cause to be recovered. This is important for consumers that
need to be able to detect context errors, such as `Cancelled` and
`DeadlineExceeded`.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-09-08 17:47:43 -07:00
Michael Crosby
e345d67c4e
Merge pull request #26422 from dnephin/move_api_client
...
Move api/client -> cli/command
2016-09-08 16:44:49 -07:00
Justin Cormack
da7a7f9b76
Merge pull request #26375 from cpuguy83/fix_apt_mirror_propagation
...
Propagate BUILD_APT_MIRROR and consume in buil-deb
2016-09-09 00:02:42 +01:00
Darren Stahl
fdce2a7775
Don't attempt to evaluate drive root on Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-09-08 13:52:54 -07:00
Daniel Nephin
485881b038
Fix a test that expects whitespace at the end of the line.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-09-08 15:50:14 -04:00
Daniel Nephin
9c2b935812
Replace api/client imports with cli/command in experimental files.
...
Using
git grep -l 'client\.DockerCli' cli/command/stack/ | xargs sed -i -e 's/client\.DockerCli/command\.Dockercli/g'
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-09-08 15:46:48 -04:00
Daniel Nephin
0640a14b4f
Move api/client -> cli/command
...
Using
gomvpkg
-from github.com/docker/docker/api/client
-to github.com/docker/docker/cli/command
-vcs_mv_cmd 'git mv {{.Src}} {{.Dst}}'
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-09-08 15:46:29 -04:00
Brian Goff
93e8aff1bc
Merge pull request #26406 from AkihiroSuda/fix-make-manpages
...
client: transport: fix tlsconfig Clone() on different Golang versions
2016-09-08 15:37:54 -04:00
Alexander Morozov
d959e7fac4
Merge pull request #26107 from dnephin/client_cleanup
...
Shrink the DockerCLI type
2016-09-08 12:18:46 -07:00
Richard Mathie
21a9c64b77
Update service_create.md
...
More info on endpoint setting, and service discovery on swarm mode overlay network.
Signed-off-by: Richard Mathie <richard.mathie@amey.co.uk>
2016-09-08 12:11:48 -07:00
Michael Crosby
46d2256370
Merge pull request #26423 from AkihiroSuda/md2man106-1
...
update go-md2man to v1.0.6
2016-09-08 11:38:29 -07:00
Michael Crosby
061cc41759
Merge pull request #26224 from q384566678/test-zhou
...
Modify rename function use tips
2016-09-08 11:22:21 -07:00
Michael Crosby
4e2d442901
Merge pull request #26119 from cpuguy83/lazily_load_fixtures
...
Move some test fixtures to go
2016-09-08 11:16:27 -07:00
Akihiro Suda
128cefc3bd
client: transport: fix tlsconfig Clone() on different Golang versions
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-08 17:55:54 +00:00
Michael Holzheu
47f13d3b84
Dockerfile.s390x: Use binary go package
...
We finally have a s390x binary tarball for go on "storage.googleapis.com".
So use this instead of bootstrapping with gccgo.
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
2016-09-08 19:52:43 +02:00
Akihiro Suda
35ebc168e3
update go-md2man to v1.0.6
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-08 17:25:56 +00:00
Brian Goff
ba07661f0d
Merge pull request #26405 from yongtang/26326-inspect-ulimit-with-daemon-default
...
Fix Ulimits in `docker inspect` when daemon default exists
2016-09-08 13:21:26 -04:00
Aaron Lehmann
bc06542a17
Merge pull request #25523 from dmcgowan/fsync-layer-filestore
...
Update layer store to sync transaction files before committing
2016-09-08 10:03:12 -07:00
Michael Crosby
d579e24ad2
Merge pull request #26397 from crosbymichael/rm-vendor-api
...
Remove unused engine-api packages
2016-09-08 10:00:51 -07:00
Daniel Nephin
6af6a3a538
Move holdHijackConnection to the container package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-09-08 12:58:06 -04:00
Madhu Venugopal
719a640743
Merge pull request #25962 from mrjana/net
...
Add support for docker run in swarm mode overlay
2016-09-08 09:39:00 -07:00
Daniel Nephin
31d8c27e70
Move container util methods to the container package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-09-08 12:38:52 -04:00
Daniel Nephin
bec81075bf
Extract input stream into a new type.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-09-08 12:34:55 -04:00