beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
29797 commits 14 branches 412 tags 338 MiB
Commit graph

4555 commits

Author SHA1 Message Date
Aaron Lehmann
089842c4b4 Don't resolve or pull images referenced by ID 
If a swarm service is created using an image ID, it's useless to try to
pull this reference or resolve it to a manifest digest. Avoid doing this
when a fully qualified image ID is given.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-28 13:53:52 -08:00
John Howard
49f392ff6b Windows: Builder case insensitive env 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-28 10:30:45 -08:00
Doug Davis
937027a0cb Merge pull request #28514 from Microsoft/jjh/workdir 
Refix COPY file . after WORKDIR (now always created)
 2016-11-28 12:58:17 -05:00
Antonio Murdaca
76a0dfaa8e Merge pull request #28710 from miaoyq/eliminate-redundant-parameters 
Eliminate the redundant parameter
 2016-11-26 14:37:17 +01:00
Antonio Murdaca
022c13271b Merge pull request #28829 from lixiaobing10051267/masterDaemon 
check typos and fix in daemon directory
 2016-11-26 14:33:09 +01:00
lixiaobing10051267
cf4f5b4771 check typos and fix in daemon directory 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>

Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-11-26 17:23:21 +08:00
Justin Cormack
cd5c8e9c2d Fix grammar on error message 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-25 14:58:20 +00:00
Sebastiaan van Stijn
e026f80a4d Merge pull request #28759 from miaoyq/optimization-context-name1 
Optimize the function 'Context.Name()' and replace 'Context.Container…
 2016-11-25 13:25:17 +01:00
Justin Cormack
8602d97835 Merge pull request #28804 from bfirsh/better-service-network-overlay-error-message 
Improve error when connecting service to network
 2016-11-24 09:06:51 -08:00
Ben Firshman
70acb89fa2
Improve error when connecting service to network 
The error didn't hint at how to resolve it. Google auto-suggest
also implies that people have been Googling this error.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-24 14:43:24 +00:00
Yanqiang Miao
3b82eac65f Fix a error of the function 'CopyMessage' in 'daemon/logger/logger.go' 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

add a test for 'CopyMessage'

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2016-11-24 20:08:54 +08:00
Yanqiang Miao
52fd6e4664 Optimize the function 'Context.Name()' and replace 'Context.ContainerName' that need to remove slash with 'Context.Name()'. 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2016-11-24 09:24:29 +08:00
Yong Tang
c90ec05175 Restrict checkpoint name to prevent directory traversal 
This fix tries to address the issue raised in 28769 where
checkpoint name was not checked before passing to containerd.
As a result, it was possible to use a special checkpoint name
to get outside of the container's directory.

This fix add restriction `[a-zA-Z0-9][a-zA-Z0-9_.-]+` (`RestrictedNamePattern`).
This is the same as container name restriction.

This fix fixes 28769.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-23 13:23:07 -08:00
John Howard
286ab6d69b COPY file . after WORKDIR (now always created) 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-23 09:56:02 -08:00
Antonio Murdaca
30b8712e93
daemon: remove not needed unmarshal 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-11-23 12:53:25 +01:00
Yanqiang Miao
58028a2919 Eliminate redundant parameters 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2016-11-23 09:28:13 +08:00
Tõnis Tiigi
5c1826ec4d Merge pull request #28683 from darrenstahlmsft/SystemDLL 
Swap usage of LazyDLL and LoadDLL to LazySystemDLL
 2016-11-22 16:58:30 -08:00
Victor Vieux
22ba220e86 Merge pull request #28727 from cyli/do-not-display-secret-digest 
Do not display the digest or size of swarm secrets [1.13]
 2016-11-22 16:44:06 -08:00
Anusha Ragunathan
23ea9e45fd Merge pull request #28601 from tiborvass/plugin-misc-fixes 
Plugin miscellaneous fixes
 2016-11-22 16:12:37 -08:00
cyli
2c0613540a Do not display the digest or size of swarm secrets 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-11-22 18:13:27 -05:00
Darren Stahl
22c83c567f Swap usage of LazyDLL and LoadDLL to LazySystemDLL. 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-11-22 14:57:11 -08:00
Tibor Vass
6547609870 plugins: misc fixes 
Rename variable to reflect manifest -> config renaming
Populate Description fields when computing privileges.
Refactor/reuse code from daemon/oci_linux.go

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-11-22 14:32:07 -08:00
Sebastiaan van Stijn
0415525049 Merge pull request #26833 from cpuguy83/use_mounts_api_for_services 
Use container Mounts API for Swarm containers.
 2016-11-22 22:48:54 +01:00
Victor Vieux
c025d56504 Merge pull request #28691 from aluzzardi/service-logs-no-follow 
[experimental] service logs: Support no-follow mode
 2016-11-22 13:48:14 -08:00
Sebastiaan van Stijn
313502488e Merge pull request #28506 from bfirsh/prepare-api-docs-for-swagger-docs 
Prepare docs and Swagger definition for automatically generated API docs
 2016-11-22 22:47:38 +01:00
Sebastiaan van Stijn
9d0050727d Merge pull request #28598 from darrenstahlmsft/VmcomputeDNE 
Ensure vmcompute.dll exists during daemon start
 2016-11-22 21:31:45 +01:00
Brian Goff
821aeb6a6f Use container Mounts API for Swarm containers. 
Instead of converting nicely typed service mounts into untyped `Binds`
when creating containers, use the new `Mounts` API which is a 1-1
mapping between service mounts and container mounts.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-11-22 13:23:51 -05:00
Tibor Vass
53b9b99e5c plugins: support for devices 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-11-22 09:54:45 -08:00
Ben Firshman
f0d55cd081
Rename Remote API to Engine API 
Implementation of https://github.com/docker/docker/issues/28319

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-22 12:49:38 +00:00
Vincent Demeester
48c3df015d Merge pull request #28651 from YuPengZTE/devMD002 
First header should be a top level header
 2016-11-22 13:11:37 +01:00
Andrea Luzzardi
c2d435e4f0 service logs: Support no-follow mode 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2016-11-21 18:02:13 -08:00
Darren Stahl
000366f1a7 Ensure vmcompute.dll exists during daemon start 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-11-21 17:40:31 -08:00
yupeng
1e65db4206 First header should be a top level header 
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
 2016-11-22 09:33:21 +08:00
Victor Vieux
3a6829257e Merge pull request #28504 from runcom/fix-info-route-secopt 
api: types: do not remove old SecurityOptions struct
 2016-11-21 13:55:07 -08:00
Victor Vieux
6e4a3c4546 Merge pull request #28649 from allencloud/judge-locked-before-parsing-key 
judge manager if locked before parsing key
 2016-11-21 13:33:38 -08:00
Vincent Demeester
05963010ee Merge pull request #28556 from ehazlett/container-secret-store 
Fix target reference secrets and container secret store
 2016-11-21 21:40:01 +01:00
allencloud
89100c162b judge manager if locked before parsing key 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-21 16:39:09 +08:00
zhukj
cf3ef262b1 close the file 
Signed-off-by: zhukj <zhu.kunjia@zte.com.cn>
 2016-11-21 19:56:01 +08:00
Vincent Demeester
baa14c0e61 Merge pull request #28026 from ripcurld00d/fix_27772 
Return an empty stats if the container is restarting
 2016-11-20 21:14:37 +01:00
Antonio Murdaca
514ca09426
api: types: keep info.SecurityOptions a string slice 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-11-19 13:21:16 +01:00
Doug Davis
96f50e9b70 Merge pull request #28611 from vieux/fix_golint 
fix a few golint errors
 2016-11-19 07:16:44 -05:00
Victor Vieux
f6f67891be Merge pull request #28438 from vdemeester/use-container-shell-instead-of-hardcoded 
Use Container.Config.Shell instead of hardcoded…
 2016-11-18 18:54:36 -08:00
Victor Vieux
eb8fc5dcc3 Merge pull request #28605 from cpuguy83/use_v2_for_graph_plugins 
Allow graphdriver plugins to use v2
 2016-11-18 18:45:34 -08:00
Victor Vieux
9c559e6d0b fix a few golint errors 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-18 18:32:02 -08:00
Brian Goff
020b051dfb Allow graphdriver plugins to use v2 
Currently the plugin initialization is too late for a loaded v2 plugin
to be usable as a graph driver.

This moves the initialization up before we create the graph driver.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-11-18 17:23:59 -05:00
Aaron Lehmann
30d0c3899e Merge pull request #28421 from aaronlehmann/digest-pinning-warnings 
Return warnings from service create/update when digest pinning fails
 2016-11-18 11:33:17 -08:00
Tõnis Tiigi
eb0fc787e6 Merge pull request #28533 from allencloud/judge-manager-first-before-unlocking 
judge manager before unlocking
 2016-11-18 11:27:48 -08:00
Evan Hazlett
eb036ea4db
lint fixes 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-18 13:04:08 -05:00
Aaron Lehmann
948e60691e Return warnings from service create and service update when digest pinning fails 
Modify the service update and create APIs to return optional warning
messages as part of the response. Populate these messages with an
informative reason when digest resolution fails.

This is a small API change, but significantly improves the UX. The user
can now get immediate feedback when they've specified a nonexistent
image or unreachable registry.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-18 09:31:31 -08:00
Brian Goff
06e92cc2c1 Merge pull request #28577 from chchliang/defercode 
function setupOOMScoreAdj file close illogicality
 2016-11-18 11:48:58 -05:00
allencloud
972a246c67 judge manager before unlocking 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-18 23:49:40 +08:00
chchliang
e82fa89bcd function setupOOMScoreAdj file close illogicality 
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn>
 2016-11-18 17:34:01 +08:00
Michael Crosby
aff99136b4 Fix cfs period calculation 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-11-18 00:47:43 -08:00
Michael Crosby
4b29f404b1 Merge pull request #28458 from yongtang/28456-cpus-error-message 
Fix error messages for `--cpus` from daemon
 2016-11-17 16:29:21 -08:00
Evan Hazlett
bebd472e40 do not force target type for secret references 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

use secret store interface instead of embedded secret data into container

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-17 15:49:02 -05:00
Sebastiaan van Stijn
f297dea657 Merge pull request #28551 from cpuguy83/28517_dont_spew_so_much 
Reduce spew data dumped
 2016-11-17 21:37:06 +01:00
Brian Goff
22dccaf2d6 Merge pull request #28538 from yongtang/11162016-Log-Logf-fix 
Fix several issues with `go vet` and `gofmt -s`
 2016-11-17 15:21:22 -05:00
Alexander Morozov
c2fbf0871d Merge pull request #28462 from tonistiigi/health-deadlock 
Fix deadlock on cancelling healthcheck
 2016-11-17 10:30:57 -08:00
Alexander Morozov
8a6c5358af Merge pull request #28536 from allencloud/remove-unused-err-ErrPendingSwarmExists 
remove unused error ErrPendingSwarmExists
 2016-11-17 10:17:47 -08:00
Brian Goff
4130eb24e9 Reduce spew data dumped 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-11-17 13:10:48 -05:00
Yong Tang
ace786e9d5 Fix several issues with go vet and go fmt 
For some reason, `go vet` and `go fmt` validate does not capture
several issues.

The following was the output of `go vet`:
```
ubuntu@ubuntu:~/docker$ go vet ./... 2>&1 | grep -v ^vendor | grep -v '^exit status 1$'
cli/command/formatter/container_test.go:393: possible formatting directive in Log call
volume/volume_test.go:257: arg mp.RW for printf verb %s of wrong type: bool
```

The following was the output of `go fmt -s`:
```
ubuntu@ubuntu:~/docker$ gofmt -s -l . | grep -v ^vendor
cli/command/stack/list.go
daemon/commit.go
```

Fixed above issues with `go vet` and `go fmt -s`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-17 06:31:28 -08:00
Sebastiaan van Stijn
85bc735b4a Merge pull request #28498 from rhvgoyal/rwlayer-opts 
Move CreateRWLayer() parameters in a struct
 2016-11-17 13:57:59 +01:00
yupeng
9551dd03cf Fix the typo 
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
 2016-11-17 14:13:38 +08:00
allencloud
7777557a3a remove unused error ErrPendingSwarmExists 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-17 14:06:08 +08:00
John Howard
7e03ce3f13 Windows: Revert 27884 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-16 13:38:45 -08:00
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
Brian Goff
0bd720b28d Move stack dump dir to exec root 
Dump stack dumps to exec root instead of daemon root.
When no path is provided to the stack dumper, such is the case with
SIGQUIT, dump to stderr.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-11-16 12:55:18 -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
Tonis Tiigi
89b1234737 Fix deadlock on cancelling healthcheck 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-11-15 20:10:16 -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
Yong Tang
d22ac2f3a0 Fix error messages for --cpus from daemon 
This fix fixes error messages for `--cpus` from daemon.

When `docker run` takes `--cpus`, it will translate into NanoCPUs
and pass the value to daemon. The `NanoCPU` is not visible to the user.
The error message generated from daemon used 'NanoCPU' which may cause
some confusion to the user.

This fix fixes this issue by returning the error in CPUs instead.

This fix fixes 28456.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-15 17:16:09 -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
Vincent Demeester
5f81cf11f6
Use Container.Config.Shell instead of hardcoded… 
… for healthcheck. It make the code a little cleaner and more
future/usage proof.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-15 17:53:24 +01: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