Commit graph

30431 commits

Author SHA1 Message Date
allencloud
8e04e9902a return error when listNode fails
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-01-19 14:02:06 +08:00
Akihiro Suda
7d0041f9e5 Merge pull request #30218 from kevinetc123/patch-typo
fix a typo error
2017-01-19 14:34:19 +09:00
kaiwentan
b8155bd5be correct all the formate to formatter
Signed-off-by: kaiwentan <kaiwentan@harmonycloud.cn>
2017-01-19 11:26:49 +08:00
Nishant Totla
8de8b1d520
Make Docker automatically update hostname for Swarm node
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2017-01-18 15:55:53 -08:00
Brian Goff
0e8c7d7277 Merge pull request #30208 from justincormack/no-sqlite
Remove sqlite dependency
2017-01-18 13:15:38 -05:00
Sebastiaan van Stijn
e1c5e72902 Merge pull request #30185 from vdemeester/integration-build-cmd-cleanup-take2
[test-integration] Clean more build utils
2017-01-18 15:12:03 +01:00
Sebastiaan van Stijn
5eda0c5947 Merge pull request #28925 from daehyeok/ineffassign
Refactoring ineffectual assignments
2017-01-18 15:01:57 +01:00
Justin Cormack
f8119bb7a7 Remove sqlite
This drops support for migrations from pre-1.10 Docker versions, which
should be done via an external tool or an intermediate upgrade.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-18 12:27:21 +00:00
Vincent Demeester
8bc7e19346 Merge pull request #30041 from stevvooe/tips-for-successful-changes
CONTRIBUTING: add tips for succesful changes
2017-01-18 10:00:15 +01:00
Akihiro Suda
30ca9e3b0c Merge pull request #30230 from stupendous-man/fix-typos
Fixed a typo within pkg/authorization/api.go
2017-01-18 14:23:03 +09:00
Akihiro Suda
d324537117 Merge pull request #30215 from WeiZhang555/fix-go-vet
Fix escaped go vet error
2017-01-18 12:48:22 +09:00
Diego Romero
48b8f54876 Fixed a typo within pkg/authorization/api.go
Signed-off-by: Diego Romero <idiegoromero@gmail.com>
2017-01-17 21:51:16 -05:00
Tõnis Tiigi
56b951fbe5 Merge pull request #30219 from tonistiigi/test-port-leak
Switch TestSwarmPublishDuplicatePorts to different ports
2017-01-17 17:16:14 -08:00
Sebastiaan van Stijn
48184351c9 Merge pull request #29076 from justincormack/seccomp-socket-to-them
Block obsolete and unusual socket families in the default seccomp profile
2017-01-18 01:53:17 +01:00
Kenfe-Mickael Laventure
fb2bb3653e Close logwatcher on context cancellation
This commit addresses 2 issues:

  1. in `tailfile()` if somehow the `logWatcher.Msg` were to become full and the watcher closed before space was made into it, we were getting stuck there forever since we were not checking for the watcher getting closed
  2. when servicing `docker logs`, if the command was cancelled we were not closing the watcher (and hence notifying it to stop copying data)

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-01-17 14:36:13 -08:00
Alexander Morozov
2169723538 Merge pull request #30220 from ehazlett/fix-log-import
Remove cloudflare log import
2017-01-17 14:21:36 -08:00
Kenfe-Mickaël Laventure
645bdc22ec Merge pull request #30212 from thaJeztah/here-come-the-captains
Welcome the captains :-)
2017-01-17 13:54:01 -08:00
Stephen J Day
59e1d579e0
CONTRIBUTING: add tips for succesful changes
Expand the contributing doc to include tips for successful PRs and
guidance on commit messages. This should help contributers to have
better position PRs that are more likely to be merged.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-01-17 13:15:26 -08:00
Evan Hazlett
e221b74bd1
fix log import
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2017-01-17 14:20:54 -05:00
Tonis Tiigi
24cd5444f9 Switch TestSwarmPublishDuplicatePorts to different ports
There is an issue with the ports leaking to other tests.
This is a workaround until the actual problem is addressed.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-01-17 10:54:22 -08:00
Sebastiaan van Stijn
f19a293dd7 Merge pull request #29965 from yongtang/29946-networks-api
Return `[]` instead of `null` in case `filterNetworks` returns empty
2017-01-17 18:58:35 +01:00
Justin Cormack
7e3a596a63 Block obsolete socket families in the default seccomp profile
Linux supports many obsolete address families, which are usually available in
common distro kernels, but they are less likely to be properly audited and
may have security issues

This blocks all socket families in the socket (and socketcall where applicable) syscall
except
- AF_UNIX - Unix domain sockets
- AF_INET - IPv4
- AF_INET6 - IPv6
- AF_NETLINK - Netlink sockets for communicating with the ekrnel
- AF_PACKET - raw sockets, which are only allowed with CAP_NET_RAW

All other socket families are blocked, including Appletalk (native, not
over IP), IPX (remember that!), VSOCK and HVSOCK, which should not generally
be used in containers, etc.

Note that users can of course provide a profile per container or in the daemon
config if they have unusual use cases that require these.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-17 17:50:44 +00:00
Vincent Demeester
74bebcc140 Merge pull request #29930 from Microsoft/jjh/envdocs
Docs: Refresh run.md ENV paragraphs
2017-01-17 18:03:08 +01:00
Zhang Wei
3551893f46 Fix escaped go vet error
Find one escaped go vet error:

```
$ cd pkg/httputils/
$ go vet .
httputils_test.go:28: arg response for printf verb %q of wrong type:
*net/http.Response
```

You can also find it with

```
$ go vet github.com/docker/docker/pkg/httputils/
```

or

```
$ go vet ./...
```

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2017-01-18 00:13:09 +08:00
Vincent Demeester
96815a7dc4 Merge pull request #29759 from allencloud/purify-error-message-for-create-and-run
purify error message in cli for create and run command
2017-01-17 16:53:51 +01:00
Vincent Demeester
f63d1a6eec Merge pull request #30209 from WeiZhang555/add-build-args-for-rpmbuild
Add missing ${DOCKER_BUILD_ARGS}
2017-01-17 15:52:10 +01:00
Vincent Demeester
c10f6ef43f
Clean more build utils in integration cli
- Remove deprecated buildImage* functions
- Rename buildImageNew to buildImage
- Use *check.C in fakeContext* setup and in getIdByName

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-01-17 15:42:38 +01:00
Alexander Morozov
b0f9958d93 daemon: remove graphdb usage
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2017-01-17 13:52:48 +00:00
Sebastiaan van Stijn
8c7651998f Merge pull request #30094 from miaoyq/complete-opt-for-plugin-install
Complete the options for 'docker plugin install'
2017-01-17 14:40:31 +01:00
Vincent Demeester
4fdfcb36cd Merge pull request #30138 from vdemeester/integration-use-testenv
[test-integration] Use testEnv methods and remove most of the global variables
2017-01-17 14:31:49 +01:00
Vincent Demeester
8518965d18 Merge pull request #29329 from thaJeztah/fix-fqdn-hostname
Add test for fqdn hostname not being set in container
2017-01-17 14:31:29 +01:00
Sebastiaan van Stijn
57de634bf3
Add new curators to MAINTAINERS
The Docker Captains are going to assist in our
triage process! \o/ \o/

This change adds the captains to the maintainers
file as a curator.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-17 14:31:24 +01:00
Zhang Wei
062ce13e9c Add missing ${DOCKER_BUILD_ARGS}
Add missing "${DOCKER_BUILD_ARGS}" for building rpm with `docker build`,
this is quite important when running `make rpm` behind http proxy.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2017-01-17 20:10:48 +08:00
Vincent Demeester
c8016e669f
Use testEnv methods and remove most of the global variables
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-01-17 12:39:08 +01:00
Vincent Demeester
9ebb90883e Merge pull request #30200 from albers/completion-build--squash
Add bash completion for `build --squash`
2017-01-17 12:07:00 +01:00
Sebastiaan van Stijn
950792dc6d add integration test for FQDN hostname
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-17 11:01:59 +01:00
allencloud
3f1feaf4d6 purify error message in cli for create and run command
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-01-17 17:21:17 +08:00
Sebastiaan van Stijn
05378f4898 Merge pull request #30204 from YuPengZTE/devSem
fix the bare url and the Summary of http://semver.org
2017-01-17 10:04:33 +01:00
Jorge Marin
2bee1cfd5a Use quoted form of container name and container id
Use quoted form of container name and container id to improve copy-paste avoiding the extra `.` that slips into the clipboard

Signed-off-by: Jorge Marin <chipironcin@users.noreply.github.com>
2017-01-17 08:26:05 +00:00
yupengzte
1f925d1d5c fix the bare url and the Summary of http://semver.org
Signed-off-by: yupengzte <yupeng36@zte.com.cn>
2017-01-17 16:20:11 +08:00
Harald Albers
e91dbba7ff Add bash completion for build --squash
Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-17 08:52:18 +01:00
Kenfe-Mickaël Laventure
a7c3389a82 Merge pull request #30181 from albers/completion--filter-until
Add bash completion for `container|image|network prune --filter until`
2017-01-16 08:47:34 -08:00
Brian Goff
e74623d283 Merge pull request #30113 from thaJeztah/fix-autoremove-on-older-api
Don't use AutoRemove on older daemons
2017-01-16 08:40:00 -05:00
Harald Albers
217786423c Add bash completion for container|image|network prune --filter until
Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-16 10:47:52 +01:00
Akihiro Suda
dcf1264f1c Merge pull request #30058 from vdemeester/integration-build-cmd-clean
[test-integration] clean docker_cli_build_test.go
2017-01-16 18:16:49 +09:00
Vincent Demeester
fd0ea76931 Merge pull request #30163 from albers/completion-fix-hide-legacy-commands
Fix treatment of DOCKER_HIDE_LEGACY_COMMANDS in bash completion
2017-01-16 10:01:44 +01:00
Vincent Demeester
ead8ce2431 Merge pull request #30151 from tonistiigi/fix-defunct
Avoid defunct registry/notary processes during tests
2017-01-16 08:55:16 +01:00
Sebastiaan van Stijn
582c5b7652 Merge pull request #30140 from mlaventure/remove-fifo-timeout
Remove timeout on fifos opening
2017-01-15 22:47:30 +01:00
Vincent Demeester
fa4f09194f Merge pull request #28690 from zteBill/volume-errorinfo-inexact
repeated volume create information
2017-01-15 17:10:27 +01:00
Vincent Demeester
c778f4b964
Refactor docker_cli_build_test.go
Use `testutil/cmd` for `buildCommand`.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-01-15 16:48:08 +01:00