23e3dc0dcd
Merge pull request #26472 from yongtang/09112016-docker-build-step-0
...
Fix documentation for `Step 0` to `Step 1` in `docker build`
Upstream-commit: e41839e8a154f1336b3a995dba3f5912dde7e0fe
Component: engine
2016-09-12 09:08:35 -04:00
71716dd310
Merge pull request #26483 from miaoyq/optimized-debug-print-in-devicemapper
...
Optimized debug print in the 'deviceset.go'
Upstream-commit: ab2c9b373dbe0aee8441821a0e14bd66a58ba612
Component: engine
2016-09-12 15:08:12 +02:00
0b4dde90a0
Merge pull request #26301 from albers/completion-service-groups
...
Add bash completion for `service {create,update} --group-{add,rm}`
Upstream-commit: 5ada5f129f8c845c11daf8167a92c4c92d2b917c
Component: engine
2016-09-12 09:05:49 -04:00
06f3b31b69
test: fix trivial code convention noncompliance
...
daemon/events/testutils: rename eventstestutils to testutils
volume/testutils: rename volumetestutils to testutils
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: e03cc68e3adb8aa584ed7db3cd70084fac0a2c4f
Component: engine
2016-09-12 07:36:52 +00:00
467aa61392
Optimized debug print in the 'deviceset.go'
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 664ad19486b55a529ba2ba53b7d432b03dc5384a
Component: engine
2016-09-12 15:34:17 +08:00
ec2041215e
Merge pull request #26306 from deployable/patch-1
...
Remote API documentation consistancy
Upstream-commit: 2cce7bf33a1af566670ec0fb2deeff8056b2798d
Component: engine
2016-09-12 10:52:30 +10:00
4472545a05
Merge pull request #26458 from sfsmithcha/fix_vip_diagram
...
updates swarm overlay network diagram
Upstream-commit: ae4582dc28ba33f80f17e2cf47e62e464aac7ec5
Component: engine
2016-09-12 10:11:08 +10:00
70a2fe1d7b
Fix documentation for Step 0 to Step 1 in docker build
...
The indexing of steps in the output of `docker build` starts with `Step 1`.
However, there are several places in the docs that start with `Step 0`.
This fix addresses the issue and changes `Step 0` to `Step 1` (and subsequent steps).
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 256dbe4b752ba1fde88e6fad76e3a6b08e4a8816
Component: engine
2016-09-11 10:52:40 -07:00
63c413223c
Merge pull request #26448 from michael-holzheu/PR-libnetwork-bump-to-fix-s390x-ci
...
Vendor libnetwork @51d88e9ae63f
Upstream-commit: 130db0a4894abea39f6e9503711804d2807628bd
Component: engine
2016-09-10 06:00:32 -07:00
c47747e33c
Merge pull request #26426 from sfsmithcha/carry_pry_25414
...
Carry pr 25414
Upstream-commit: e6f76800f5880652382a6f9180bfdefe6aaad577
Component: engine
2016-09-10 11:50:28 +02:00
7e3f0fe810
Merge pull request #26303 from yongtang/26300-docker-images-3-fractional-digits
...
Restrict size to 2 fractional digits for `docker images`
Upstream-commit: 4c3f2e7c376c83593188f6548652e9261209c908
Component: engine
2016-09-10 11:32:45 +02:00
f9b7ffdb90
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 >
Upstream-commit: e0a552504e64192946c86d3bdd517ae7b3af348f
Component: engine
2016-09-10 12:27:41 +10:00
c54b5bf8c4
Merge pull request #26457 from aboch/auto
...
Add fallback to resolveSystemAddr() in linux
Upstream-commit: ebae43efc2c1a13f0ff9b46ab568ba758e1a9b66
Component: engine
2016-09-09 20:46:29 -04:00
0b9d5f508c
carries and closes 25414
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: e7e85c7e067167f6ed14866b66afa461d2de32ba
Component: engine
2016-09-09 15:57:53 -07:00
c4f625455b
updates swarm overlay network diagram
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 48f3aa7805fc935d1c07f9c697edcb6b274252da
Component: engine
2016-09-09 15:18:53 -07:00
52c85142d9
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 >
Upstream-commit: c0b24c600e30656144522f85b053f015525022da
Component: engine
2016-09-09 13:27:57 -07:00
32b3a84313
Merge pull request #22049 from boucher/docker-checkpoint-restore
...
Implement containerd API for checkpoints
Upstream-commit: cf58eb437c4229e876f2d952a228b603a074e584
Component: engine
2016-09-09 13:36:55 -04:00
6bdcfc529e
Vendor libnetwork @51d88e9ae63f
...
- Fixes #26440
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com >
Upstream-commit: 7d8048de06d6074dc83c973a48c1e1a1b60704b6
Component: engine
2016-09-09 18:57:15 +02:00
fcbd8b4fb4
Merge pull request #26443 from dnephin/move_trust_client
...
Move image trust related cli methods into the image package
Upstream-commit: 81090c945515066681ac7fd195660e8a28247007
Component: engine
2016-09-09 12:29:28 -04:00
f1d86422d0
Update checkpoint comments to be more accurate
...
Signed-off-by: boucher <rboucher@gmail.com >
Upstream-commit: 67f607a02f8e86586f3984c7fd24961deba29b8b
Component: engine
2016-09-09 12:13:46 -04:00
9c73c5a62a
Merge pull request #26438 from lixiaobing10051267/masterSystem
...
docker daemon requires windows version info while low build
Upstream-commit: 704049a6914b1fa38199bf8dc38af761eb3e7f2d
Component: engine
2016-09-09 09:12:47 -07:00
5c50f1d40b
Merge pull request #26428 from darrenstahlmsft/AddToSymlink
...
Don't attempt to evaluate drive root on Windows
Upstream-commit: c1f2776bf1e8997e44d3c244e99104b3511b7255
Component: engine
2016-09-09 09:09:24 -07:00
54ffd0826e
Specify the required version while the version not support daemon
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: b4b9efd4c515601c60439b146a603fe17fa823fb
Component: engine
2016-09-09 23:04:45 +08:00
30f4e29669
Move image trust related cli methods into the image package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e7c9694d76390e9f8a0d1ec3f54c2eda632b3759
Component: engine
2016-09-09 10:50:16 -04:00
8a99df66fe
Merge pull request #26432 from stevvooe/dont-hide-context-errors
...
client: don't hide context errors
Upstream-commit: 89bc5d54ca09573378616c4ee0000bb370d27aec
Component: engine
2016-09-09 08:53:43 -04:00
e8f53d8ee7
Merge pull request #26424 from michael-holzheu/PR-s390x-bump-to-binary-go-1-7-1
...
Dockerfile.s390x: Use binary go package
Upstream-commit: 7c118f40cb96f8eb112c89d2d517252dff791c5f
Component: engine
2016-09-09 09:53:02 +01:00
820ac3028c
Update containerd to fix unkillable restored containers.
...
Signed-off-by: boucher <rboucher@gmail.com >
Upstream-commit: 6bc9a2d563ace9fa604de15731e263b353e83120
Component: engine
2016-09-08 21:31:56 -04:00
982e83123e
Fix the clashing route syntax for checkpoint/container delete.
...
Signed-off-by: boucher <rboucher@gmail.com >
Upstream-commit: 0dfbf960d72fc3f7deec02cc3f36385361216794
Component: engine
2016-09-08 21:31:56 -04:00
86bd90005f
Fix typo
...
Signed-off-by: boucher <rboucher@gmail.com >
Upstream-commit: cb0ad4258b4c9615a16960c2a6125d2c40896d3b
Component: engine
2016-09-08 21:31:56 -04:00
7bef93723c
Initial implementation of containerd Checkpoint API.
...
Signed-off-by: boucher <rboucher@gmail.com >
Upstream-commit: d8fef66b03c1ea8715470690efbd950033f7f628
Component: engine
2016-09-08 21:31:52 -04:00
b896a9dba6
Revendor go-units to f2145db703495b2e525c59662db69a7344b00bb8
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 6866fda800ab9adb9a88b60f6660b512401c921f
Component: engine
2016-09-08 18:26:50 -07:00
5a872990c6
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 >
Upstream-commit: 4e7e3919cedd2ba6ec5b9a4deb4cab56be460c23
Component: engine
2016-09-08 18:26:50 -07:00
015d80b443
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 >
Upstream-commit: 8e5ef8af5c90a3fbc93173cb485d42e044ca56ae
Component: engine
2016-09-08 17:47:43 -07:00
1d1f2eb8d2
Merge pull request #26422 from dnephin/move_api_client
...
Move api/client -> cli/command
Upstream-commit: e345d67c4e2862d497ec92640fd00bf04e6b696e
Component: engine
2016-09-08 16:44:49 -07:00
e2b900a8b1
Merge pull request #26375 from cpuguy83/fix_apt_mirror_propagation
...
Propagate BUILD_APT_MIRROR and consume in buil-deb
Upstream-commit: da7a7f9b769f6c1ccc88526390a3ff6528e31eb9
Component: engine
2016-09-09 00:02:42 +01:00
4e9c99c3b4
Don't attempt to evaluate drive root on Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: fdce2a7775ec80d769f585c0a400c6cf6615776b
Component: engine
2016-09-08 13:52:54 -07:00
623bb6a4a8
Fix a test that expects whitespace at the end of the line.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 485881b038eea7b1cee7f94f1e20e4cd3be85c0c
Component: engine
2016-09-08 15:50:14 -04:00
0238cc6815
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 >
Upstream-commit: 9c2b9358125175db366ca000e6dae9af8dc88e2d
Component: engine
2016-09-08 15:46:48 -04:00
d8acc366ce
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 >
Upstream-commit: 0640a14b4fcba3715f7cc3bc9444f3c7f4827edd
Component: engine
2016-09-08 15:46:29 -04:00
5f9cd25fac
Merge pull request #26406 from AkihiroSuda/fix-make-manpages
...
client: transport: fix tlsconfig Clone() on different Golang versions
Upstream-commit: 93e8aff1bc4a91e0cfdfd0974b4e68d43cc78006
Component: engine
2016-09-08 15:37:54 -04:00
0b990a4b09
Merge pull request #26107 from dnephin/client_cleanup
...
Shrink the DockerCLI type
Upstream-commit: d959e7fac4345762d26083a5d694871377f6dc75
Component: engine
2016-09-08 12:18:46 -07:00
3ad3cbeebe
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 >
Upstream-commit: 21a9c64b77bd10969dde7376060d5750c6b65aac
Component: engine
2016-09-08 12:11:48 -07:00
bbc0d92cc4
Merge pull request #26423 from AkihiroSuda/md2man106-1
...
update go-md2man to v1.0.6
Upstream-commit: 46d2256370221086e7ba9d1e85b2d56cb4aa7099
Component: engine
2016-09-08 11:38:29 -07:00
574f281ca0
Merge pull request #26224 from q384566678/test-zhou
...
Modify rename function use tips
Upstream-commit: 061cc417591217c4bcf735267c2de18f2a8189c0
Component: engine
2016-09-08 11:22:21 -07:00
fbcd483854
Merge pull request #26119 from cpuguy83/lazily_load_fixtures
...
Move some test fixtures to go
Upstream-commit: 4e2d4429013ff4f6ca100063869b27b247f7da34
Component: engine
2016-09-08 11:16:27 -07:00
29c53b20fe
client: transport: fix tlsconfig Clone() on different Golang versions
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 128cefc3bdfc458ac84ae6602d6484c79f479795
Component: engine
2016-09-08 17:55:54 +00:00
6ee28c633d
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 >
Upstream-commit: 47f13d3b84fb0ee867c6b6c2a213d78b471754bf
Component: engine
2016-09-08 19:52:43 +02:00
968f576e75
update go-md2man to v1.0.6
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 35ebc168e39cea35eda8d937f74a73d1a541065a
Component: engine
2016-09-08 17:25:56 +00:00
10deb56947
Merge pull request #26405 from yongtang/26326-inspect-ulimit-with-daemon-default
...
Fix Ulimits in `docker inspect` when daemon default exists
Upstream-commit: ba07661f0d6ae6b1b0d2e7271a8c8933bcc15364
Component: engine
2016-09-08 13:21:26 -04:00
3b1269cdeb
Merge pull request #25523 from dmcgowan/fsync-layer-filestore
...
Update layer store to sync transaction files before committing
Upstream-commit: bc06542a1715273acc087dadd8179a88386dd6fb
Component: engine
2016-09-08 10:03:12 -07:00
