Commit Graph
37584 Commits
Author SHA1 Message Date
Sebastiaan van Stijn ba4262a451 Merge pull request #32453 from cpuguy83/default_enable_pprof
Enable pprof/debug endpoints by default
Upstream-commit: eb9e5cd14bbe9b21e1774d92e2023197869d7401
Component: engine
2017-07-19 16:13:12 +02:00
Vincent Demeester ae4cfec3e4 Merge pull request #34168 from Microsoft/jjh/dodgytest
Windows: Disable TestAttachTTYWithoutStdin
Upstream-commit: 24bb61145cf380f90435d02daa485c5921a51c67
Component: engine
2017-07-19 10:19:15 +02:00
Vincent Demeester d160314d93 Merge pull request #34171 from thaJeztah/fix-secrets-api-docs
Fix API docs for GET /secrets/{id}, GET /secrets
Upstream-commit: a2202d5d5d22dedd67734c468b02b43aade6385b
Component: engine
2017-07-19 10:18:09 +02:00
Victor Vieux 7145299da3 Merge pull request #356 from dnephin/fix-codeowners
Fix .github/CODEOWNERS patterns
Upstream-commit: 7f684c7512
Component: cli
2017-07-18 17:08:37 -07:00
Daniel Nephin e4c6e38322 Fix CODEOWNERS patterns.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: cea8b4f4f3
Component: cli
2017-07-18 18:25:55 -04:00
Sebastiaan van Stijn 21d120121d Fix API docs for GET /secrets/{id}, GET /secrets
The swagger.yml defined these endpoints to return
a "ServiceSpec" instead of a "SecretSpec".

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f6954bea9f28c62c50b88c895968045cf801aa81
Component: engine
2017-07-19 00:22:05 +02:00
John Howard 416ca06159 Windows: Disable TestAttachTTYWithoutStdin
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e4ec9195fed2f3653ec6d0a2b1c9ca6b0e2b9c37
Component: engine
2017-07-18 14:23:23 -07:00
Victor Vieux b58bd71384 Merge pull request #34135 from tklauser/more-unix-fns
Replace manually written wrappers by functions from x/sys/unix
Upstream-commit: fa7db52e2603cefbf0faf4e5d525e48cfe4a3c52
Component: engine
2017-07-18 20:43:13 +02:00
Aaron Lehmann 7419227176 Merge pull request #351 from dnephin/misc-cleanup
Misc cleanup of dockerfiles and circleci
Upstream-commit: 257e113542
Component: cli
2017-07-18 10:44:51 -07:00
Brian Goff b069176a2d Merge pull request #34146 from kolyshkin/vasprintf
devmapper_wrapper.go: fix gcc warning
Upstream-commit: 72959fc2161fdcd785ad54a38cd03049250236fb
Component: engine
2017-07-18 12:46:23 -04:00
Daniel Nephin 7c2dc55ca3 Remove unnecessary prune function aliases.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ff350a04cb
Component: cli
2017-07-18 12:25:45 -04:00
Daniel Nephin 29e4b6071d Cleanup dockerfiles and circle
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0f91d9e6c4
Component: cli
2017-07-18 12:22:28 -04:00
Sebastiaan van Stijn 79a4b353ef Merge pull request #34157 from twistlock/plugable_secrets_backend
plugable secret backend
Upstream-commit: 0304c98d85404fe75a1b4a35d3c111931e062f41
Component: engine
2017-07-18 18:07:27 +02:00
Vincent Demeester c912542d4f Merge pull request #350 from thaJeztah/unexport-commands
Unexport subcommands
Upstream-commit: a14762c6d2
Component: cli
2017-07-18 17:17:01 +02:00
Daniel Nephin fa129caef8 Merge pull request #341 from thaJeztah/small-prune-refactor
Small refactor in system prune
Upstream-commit: 3209cb8da6
Component: cli
2017-07-18 10:45:21 -04:00
Sebastiaan van Stijn ea84db7e56 Unexport subcommands
These commands were only used as subcommands, so did
not have to be exported.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9c7b0d74cd
Component: cli
2017-07-18 15:26:45 +02:00
Sebastiaan van Stijn 7e5b932e43 Small refactor in system prune
Adapt "image prune" and "build cache prune" to have
the same signature as the other prune commands, so
that they can all be added to the "pruneFuncs" array.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 73163ee78b
Component: cli
2017-07-18 15:13:11 +02:00
Sebastiaan van Stijn 6250958cd7 Merge pull request #315 from ripcurld0/nat_sort
Sort swarm stacks and nodes using natural sorting
Upstream-commit: 79e4d635ca
Component: cli
2017-07-18 15:01:11 +02:00
Kenfe-Mickaël Laventure 6db8c53375 Merge pull request #345 from vdemeester/remove-prune-package
Remove useless prune package 👼
Upstream-commit: 19efbc85f4
Component: cli
2017-07-18 14:46:53 +02:00
Sebastiaan van Stijn 51e2eef57d Merge pull request #34002 from thaJeztah/carry-32483
Service privileges: API docs
Upstream-commit: 32ada4dcf12fe11e8d87820e851b8c2172761e29
Component: engine
2017-07-18 13:09:08 +02:00
Liron Levin 988a5f28f9 pluggable secret backend
Fixing secret driver serialization issue from
08f7cf05268782a0dd8e4c41a4cc65fdf78d09f2

Signed-off-by: Liron Levin <liron@twistlock.com>
Upstream-commit: e3f920d2f147025634e12abd5af3a84f436ddad1
Component: engine
2017-07-18 12:45:44 +03:00
Sebastiaan van Stijn be624ce447 Merge pull request #34155 from thaJeztah/update-authors
Update authors and mailmap
Upstream-commit: c6fe39728f0918ab475dddccacc82d02ea6fac5f
Component: engine
2017-07-18 11:05:42 +02:00
Vincent Demeester 4bd74593a1 Merge pull request #34085 from cpuguy83/tests_use_locally_built_plugin
Use local plugins, not from hub for tests
Upstream-commit: f9091195823dc409e7c0fff633c59f7a9998f4a7
Component: engine
2017-07-18 10:47:58 +02:00
Sebastiaan van Stijn 59247b3492 Update authors and mailmap
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6be41f3858522ac54f97b54a5011cda42828db39
Component: engine
2017-07-18 10:36:11 +02:00
Vincent Demeester b7e7973a5f Merge pull request #266 from jphuynh/shellcheck
Add shellcheck for bash completion
Upstream-commit: b75596e1e4
Component: cli
2017-07-18 09:59:07 +02:00
Vincent Demeester 8dbc530b62 Remove useless prune package 👼
The `cli/command/prune` just does some aliasing of `Prune*` methods,
doesn't have any use.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3f4d91508e
Component: cli
2017-07-18 09:49:02 +02:00
Vincent Demeester cc2a1a7847 Merge pull request #340 from thaJeztah/fix-dont-prune-build-cache
Fix: skip build-cache prune on unsupported versions
Upstream-commit: 277f4b997c
Component: cli
2017-07-18 09:41:37 +02:00
Kir Kolyshkin 59f36f3793 devmapper_wrapper.go: fix gcc warning
I am getting the following warning from gcc when compiling the daemon:

> # github.com/docker/docker/pkg/devicemapper
> pkg/devicemapper/devmapper_wrapper.go: In function ‘log_cb’:
> pkg/devicemapper/devmapper_wrapper.go:20:2: warning: ignoring return
> value of ‘vasprintf’, declared with attribute warn_unused_result
> [-Wunused-result]
>  vasprintf(&buffer, f, ap);
>  ^

vasprintf(3) man page says if the function returns -1, the buffer is
undefined, so we should not use it. In practice, I assume, this never
happens so we just return.

Introduced by https://github.com/moby/moby/pull/33845 that resulted in
commit 63328c6 ("devicemapper: remove 256 character limit of libdm logs")

Cc: Aleksa Sarai <asarai@suse.de>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 7da12bcfa9db4d84b2c547bee93dafeaead15b16
Component: engine
2017-07-17 17:46:44 -07:00
Brian Goff 00e1fa391a Merge pull request #34123 from twistlock/plugable_secrets_backend
pluggable secret backend
Upstream-commit: 08f7cf05268782a0dd8e4c41a4cc65fdf78d09f2
Component: engine
2017-07-17 19:00:30 -04:00
Brian Goff 1549d1d8d9 Enable pprof/debug endpoints by default
Makes sure that debug endpoints are always available, which will aid in
debugging demon issues.

Wraps debug endpoints in the middleware chain so the can be blocked by
authz.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 408c7ade7008ca9b2181e12e51a01250a7a94413
Component: engine
2017-07-17 15:01:30 -04:00
Evan Hazlett 2e0ee810bb Merge pull request #33886 from aaronlehmann/names-in-memdb
Store container names in memdb
Upstream-commit: 458f6712d4128cbf32675990ae3ad779e2972839
Component: engine
2017-07-17 14:16:41 -04:00
Brian Goff 24fde7d000 Merge pull request #34134 from pims/use-const-key
Replaces fluentd-address string by constant
Upstream-commit: d9b785cf2e004bb0024f398014146e534b2cd8c5
Component: engine
2017-07-17 11:13:54 -04:00
Sebastiaan van Stijn 2dc557d71e Fix: skip build-cache prune on unsupported versions
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6c3a448ecb
Component: cli
2017-07-17 11:55:35 +02:00
Tobias Klauser 1490278683 loopback: use IoctlGetInt/IoctlSetInt from x/sys/unix
Use IoctlGetInt/IoctlSetInt from golang.org/x/sys/unix (where
applicable) instead of manually reimplementing them.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Upstream-commit: bedf09363cb7f2f59bf2b72fea0704351b9f5c8d
Component: engine
2017-07-17 10:37:42 +02:00
Tobias Klauser 62a7e56d34 [pkg/term] use IoctlGetTermios/IoctlSetTermios from x/sys/unix
Use IoctlGetTermios/IoctlSetTermios from golang.org/x/sys/unix instead
of manually reimplementing them.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Upstream-commit: 6476504695284fcdc32b5f7621cffca22746e67d
Component: engine
2017-07-17 10:37:42 +02:00
Tobias Klauser 4437cd08db sysinfo: use Prctl() from x/sys/unix
Use unix.Prctl() instead of manually reimplementing it using
unix.RawSyscall. Also use unix.SECCOMP_MODE_FILTER instead of locally
defining it.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Upstream-commit: 6c9d715a8c64a7c782b8c7b57925e1dc19b29517
Component: engine
2017-07-17 10:37:42 +02:00
Vincent Demeester a03e065e9a Merge pull request #34106 from tonistiigi/fix-tar-prefix-header
Fix tar prefix header
Upstream-commit: 97e730ae57de11939d65e5cbef72fbec83f24bcc
Component: engine
2017-07-17 09:40:39 +02:00
tim 812c72c3da Replaces fluentd-address string by constant
Signed-off-by: tim <tim@fewagainstmany.com>
Upstream-commit: cb972b1515428fd7a8ef573fa65af08a6fef669c
Component: engine
2017-07-16 23:06:57 -07:00
Liron Levin ed052d78fd pluggable secret backend
This commit extends SwarmKit secret management with pluggable secret
backends support.

Updating the work in
[swarmkit](docker/swarmkit@eebac27434) for
pluggable secret backend and adding the
driver parameter to `SecretSpec`.

Remaining work:
- [ ] CLI support (docker/cli)
- [ ] api in [plugin helpers](docker/go-plugins-helpers))
- [ ] Reference plugin
- [ ] Documenation (after cli work)

Signed-off-by: Liron Levin <liron@twistlock.com>
Upstream-commit: 7d45cafd5746e847e58078aa2fbdde57b5f49fa4
Component: engine
2017-07-15 16:50:02 +03:00
Sebastiaan van Stijn 72d8e914bc Merge pull request #331 from yuexiao-wang/docker-search-filters
Fix filters displaying for docker search
Upstream-commit: 03a46a66bd
Component: cli
2017-07-14 23:30:43 -07:00
Sebastiaan van Stijn c6415e10ce Merge pull request #314 from allencloud/add-filter-scope-for-events
docs: add filter scope for command events and more cluster events
Upstream-commit: 47370b4863
Component: cli
2017-07-14 23:28:55 -07:00
Sebastiaan van Stijn 759b91249c Merge pull request #338 from thaJeztah/carry-moby-32483
Service privileges: CLI reference docs & completion
Upstream-commit: 9c9fe9bf1f
Component: cli
2017-07-14 23:26:52 -07:00
Sebastiaan van Stijn 42cbae8c65 Service privileges: CLI reference docs & completion
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5cc7ac2990
Component: cli
2017-07-14 22:30:47 -07:00
allencloud c456febc9c docs: add filter scope for command events and more cluster events
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 8639c9baf8
Component: cli
2017-07-15 09:17:35 +08:00
Sebastiaan van Stijn 6d6adf9904 Merge pull request #333 from dnephin/docs-arg-in-from-take-2
Improve docs about ARG in FROM
Upstream-commit: fe24806ee5
Component: cli
2017-07-14 18:04:53 -07:00
Sebastiaan van Stijn 5b6e1a1aa3 Service privileges: API docs
This documents the Service privileges
API changes, that were added in:
091b5e68ea735bf4e8ece708bbc8c413a32eab73

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d0a8e73e7b60f61db0c3799643aaccbbf33f3601
Component: engine
2017-07-14 17:04:26 -07:00
Andrew Hsu bab96155c7 Merge component 'engine' from git@github.com:moby/moby master 2017-07-14 21:15:01 +00:00
Daniel Nephin d85711734b More about ARG and build stages.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ad5d035988
Component: cli
2017-07-14 16:59:21 -04:00
Daniel Nephin 0b42de4e27 Clarify docs about ARG in FROM
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2880030814
Component: cli
2017-07-14 16:55:42 -04:00
Andrew Hsu 1a59a831b3 Merge component 'cli' from git@github.com:docker/cli master 2017-07-14 20:04:39 +00:00