Commit graph

4435 commits

Author SHA1 Message Date
Vivek Goyal
f7f3d34210 Move CreateRWLayer() parameters in a struct
Move some of the optional parameters of CreateRWLayer() in a struct
called CreateRWLayerOpts. This will make it easy to add more options
arguments without having to change signature of CreateRWLayer().

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2016-11-16 16:31:23 -05:00
Vincent Demeester
673c5ee559 Merge pull request #27631 from allencloud/get-node-brefore-update
allow node update API to receive node name and id prefix
2016-11-16 17:47:31 +01:00
Doug Davis
4dff538118 Merge pull request #28467 from miaoyq/del-redundant-logical-judgmont-statement
Remove redundant 'if' statement
2016-11-16 11:34:40 -05:00
Yanqiang Miao
d63dc45f0b Remove redundant 'if' statement
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-11-16 16:50:54 +08:00
lixiaobing10051267
320c93824b function TestCreateSuccess uses a wrong variable LogGroupName
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-11-16 16:48:36 +08:00
Tõnis Tiigi
6697fa8a68 Merge pull request #28447 from nishanttotla/use-distribution-reference-pkg
Using distribution reference pkg (pin image by digest)
2016-11-15 20:05:26 -08:00
allencloud
d075b83dd6 allow node update api receive node name and id prefix
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-16 10:18:19 +08:00
Nishant Totla
dc1b6341b9
Refactoring code for pinning image by digest
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-11-15 13:54:47 -08:00
allencloud
729b49e9c5 move func getNetwork into helper.go to keep consistent
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-16 00:28:56 +08:00
Brian Goff
5ea75bb6bf Move StreamConfig out of runconfig
`StreamConfig` carries with it a dep on libcontainerd, which is used by
other projects, but libcontainerd doesn't compile on all platforms, so
move it to `github.com/docker/docker/container/stream`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-11-14 15:15:09 -05:00
wefine
f78f7de96a fix t.Errorf to t.Error in serveral _test.go
Signed-off-by: wefine <wang.xiaoren@zte.com.cn>
2016-11-14 17:54:43 +08:00
Vincent Demeester
0f20d6f5ab Merge pull request #28350 from allencloud/add-swarm-judging-in-secret-API
judge manager before getting secret
2016-11-13 22:19:07 +01:00
Vincent Demeester
1e673b9876 Merge pull request #28310 from mlaventure/docker-info-update
Docker info binaries version update
2016-11-13 21:24:51 +01:00
allencloud
1addb4817b judge manager before getting secret
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-13 12:52:09 +08:00
chchliang
167f2f3f1b don't spell error
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn>
2016-11-12 14:57:37 +08:00
Victor Vieux
2712bb26e3 Merge pull request #28274 from Microsoft/jjh/acl
Windows: create daemon root with ACL
2016-11-11 09:20:32 -08:00
Brian Goff
de325535d4 Merge pull request #27872 from vdemeester/images-filter-filters
Add reference filter and deprecated filter param…
2016-11-11 11:24:19 -05:00
Kenfe-Mickael Laventure
17df5593eb Remove extra binaries commit variables from windows build
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-11-11 08:24:17 -08:00
Kenfe-Mickael Laventure
69f0402585 Fix version detection for docker-init
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-11-11 08:19:32 -08:00
Vincent Demeester
820b809e70
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>
2016-11-11 15:34:01 +01:00
Vincent Demeester
84450b72cd Add support for stdin_open in composefile v3
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-11 15:19:00 +01:00
Victor Vieux
90d10203a4 Merge pull request #28128 from leth/commit_image_id
Add Image ID to container commit event
2016-11-10 23:14:46 -08:00
Victor Vieux
0427afa409 Merge pull request #27955 from mlaventure/runc-docker-info
Add external binaries version to docker info
2016-11-10 21:27:14 -08:00
Tõnis Tiigi
48a0c3e831 Merge pull request #28235 from dmcgowan/fix-registry-authorization-errors
Fix registry authorization errors
2016-11-10 19:39:28 -08:00
Tõnis Tiigi
a5da9f5cc9 Merge pull request #27917 from mrjana/ports
Add support for host port PublishMode in services
2016-11-10 19:38:54 -08:00
Tõnis Tiigi
1229105582 Merge pull request #28265 from aaronlehmann/dont-repull-digest
executor: Don't repull image if pinned by digest
2016-11-10 19:19:31 -08:00
Jana Radhakrishnan
14ac9f60d0 Add support for host port PublishMode in services
Add api/cli support for adding host port PublishMode in services.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-11-10 18:07:55 -08:00
Victor Vieux
750d634d62 Merge pull request #27998 from dnephin/compose-on-swarm
Support `docker stack deploy` from a Compose file
2016-11-10 17:59:57 -08:00
John Howard
46ec4c1ae2 Windows: create daemon root with ACL
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-10 17:51:28 -08:00
Derek McGowan
c85eb00841
Update for distribution vendor
Handle updates to reference package.
Updates for refactoring of challenge manager.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-11-10 17:34:12 -08:00
Victor Vieux
acd6e0d9b2 Merge pull request #28226 from vieux/exit_exp_plugin
move plugins out of experimental
2016-11-10 17:30:54 -08:00
Tõnis Tiigi
d54f4472fd Merge pull request #28229 from darrenstahlmsft/FixUnexpectedResult
Fix failure to get containers when deleting a layer
2016-11-10 17:10:05 -08:00
Victor Vieux
bed96ce922 Merge pull request #28031 from yongtang/27902-extra-hosts
Add flag `--host` to `service create` and `--host-add/rm` to `service update`
2016-11-10 16:55:29 -08:00
John Howard
29b7a73792 Merge pull request #28268 from Microsoft/jjh/clientcheck
Windows: Additional client check
2016-11-10 16:11:44 -08:00
Victor Vieux
c410222e42 move plugins out of experimental
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-10 15:51:32 -08:00
John Howard
1e592349f1 Merge pull request #28228 from tonistiigi/swarm-cert-expired
Start daemon if certificates have been expired
2016-11-10 15:50:36 -08:00
Aaron Lehmann
5d1feb561f Merge pull request #28221 from aboch/ala
Add local address autodetection on swarm init
2016-11-10 15:45:59 -08:00
Vincent Demeester
f3f9b3dac9 Merge pull request #28264 from dmcgowan/fix-overlay2-naivediff-unittest
Skip overlay2 diff tests when using naivediff
2016-11-11 00:24:06 +01:00
Andrea Luzzardi
5f9fe54b35 Merge pull request #28089 from aluzzardi/service-logs
service logs
2016-11-10 15:13:41 -08:00
Aaron Lehmann
f69e5c18ac executor: Don't repull image if pinned by digest
If the image reference in the spec uses a digest, and an image with that
digest already exists locally, avoid an unnecessary repull.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-11-10 14:45:54 -08:00
John Howard
6b4ad8d6f5 Windows: Additional client check
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-10 14:35:19 -08:00
Tonis Tiigi
439de7694d Start daemon if certificates have been expired
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-11-10 14:11:53 -08:00
Darren Stahl
d4095a5902 Fix failure to get containers when deleting a layer
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-11-10 14:07:11 -08:00
Derek McGowan
5a1b557281
Skip overlay2 diff tests when using naivediff
Naivediff fails when layers are created directly on top of
each other. Other graphdrivers which use naivediff already
skip these tests. Until naivediff is fixed, skip with overlay2
when running tests on a kernel which causes naivediff fallback.
Fix applydiff to never use the naivediff size when not applying
changes with naivediff.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-11-10 13:52:22 -08:00
Kenfe-Mickaël Laventure
f3864bcd34 Merge pull request #27116 from cpuguy83/22564_fix_volume_unmount
Fix uneccessary calls to `volume.Unmount()`
2016-11-10 13:48:44 -08:00
Andrea Luzzardi
819d0159bb api: Service Logs support
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-10 13:46:02 -08:00
Alessandro Boch
c8d0cb9e71 Add local address autodetection on swarm init
- when advertise-addr is not local and listen-addr is
  not specified

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-10 13:45:32 -08:00
Michael Crosby
801230ce31 Merge pull request #27797 from vdemeester/stats-format-names-support
Add support for Names and ID in stats format
2016-11-10 13:26:00 -08:00
Michael Crosby
1883b73a57 Merge pull request #27753 from tonistiigi/fix-overlay-unmount
Fix overlay unmount for the root case
2016-11-10 13:14:45 -08:00
Andrea Luzzardi
0ec6865713 cluster executor: Logs retrieving support.
Plumbed the executor to the container logs backend.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-10 12:02:47 -08:00