Commit Graph

2481 Commits

Author SHA1 Message Date
Derek McGowan
eef47ffad3
Add platform filtering on children handler
Fixes pulling of multi-arch images by limiting the expansion
of the index by filtering to the current default platform.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-09-20 15:18:18 -07:00
Phil Estes
9934acb271 Merge pull request #1532 from mikebrow/seccomp-default-proc-fix
fixes missing default permission
2017-09-20 15:32:36 -04:00
Phil Estes
ef5f2025aa Merge pull request #1533 from stevvooe/specifier-default
platforms: provide simpler function for common use
2017-09-20 15:15:12 -04:00
Stephen J Day
9163377123
platforms: provide simpler function for common use
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-09-20 11:56:59 -07:00
Kenfe-Mickaël Laventure
78c4e5501c Merge pull request #1529 from crosbymichael/console
Close epoller on task delete
2017-09-20 11:24:52 -07:00
Mike Brown
120bb4cd47 fixes missing default permission
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-09-20 13:15:39 -05:00
Michael Crosby
7030a4add0 Close epoller on task stop
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-20 11:29:13 -04:00
Michael Crosby
781ce658c8 Update console dep to b28c739c79ce69d017e3691ad366
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-20 11:16:56 -04:00
Michael Crosby
d700a9c35b Merge pull request #1500 from crosbymichael/typeurl
Use external typeurl package
2017-09-19 11:03:52 -04:00
Michael Crosby
d22160c28e Vendor typeurl package
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-19 09:43:55 -04:00
Michael Crosby
929283a3ab Remove typeurl package from repo
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-19 09:43:31 -04:00
Michael Crosby
f41871be9d Merge pull request #1515 from dmcgowan/add-akihiro
Add Akihiro as maintainer
2017-09-18 15:38:04 -04:00
Kenfe-Mickaël Laventure
0cb2c961b2 Merge pull request #1519 from crosbymichael/contrib
Add readme to contib
2017-09-18 10:50:46 -07:00
Michael Crosby
58015abbd5 Add readme to contib
Closes #1442

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-18 11:47:27 -04:00
Kenfe-Mickaël Laventure
e517952bc7 Merge pull request #1378 from cpuguy83/container_store_extra_data
Add `Container` field to store client-defined data
2017-09-18 07:32:07 -07:00
Michael Crosby
59384ffdb0 Merge pull request #1522 from qingyunha/master
README.md: correct headers level
2017-09-18 10:06:28 -04:00
Tao Qingyun
e1ce48d5d2 README.md: correct headers level
Signed-off-by: Tao Qingyun <845767657@qq.com>
2017-09-17 07:24:25 +08:00
Phil Estes
b6a0fb137e Merge pull request #1518 from crosbymichael/security
Update security reporting text
2017-09-15 08:49:27 -07:00
Phil Estes
8ac9743414 Merge pull request #1510 from crosbymichael/signals
Handle signals first on boot
2017-09-15 08:48:21 -07:00
Michael Crosby
2e830e0dc0 Update security reporting text
Closes #1441

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-15 11:32:14 -04:00
Michael Crosby
72f380af45 Merge pull request #1517 from mlaventure/remove-toml-omitempty
Remove omitempty from toml tags
2017-09-15 11:30:01 -04:00
Michael Crosby
4bfe3a9998 Merge pull request #1516 from tklauser/fix-cstring-leaks
mount: fix CString memory leaks
2017-09-15 10:06:20 -04:00
Michael Crosby
7fdf8cd31e Handle signals first on boot
This handles signals first thing on boot so that plugins are able to
boot with the reaper enabled.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-15 10:00:19 -04:00
Tobias Klauser
4a582405b9 mount: fix CString memory leaks
Make sure to call C.free on C strings allocated using C.CString.

C.CString allocates memory in the C heap using malloc. It is the callers
responsibility to free them. See
https://golang.org/cmd/cgo/#hdr-Go_references_to_C for details.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2017-09-15 10:55:53 +02:00
Derek McGowan
3596ec53ab
Add Akihiro as maintainer
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-09-14 23:57:36 -07:00
Kenfe-Mickael Laventure
f2d1459929
Remove omitempty from toml tags
The encoder only support changing the name of the key.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-09-14 20:49:22 -07:00
Kenfe-Mickaël Laventure
cf1d4223be Merge pull request #1511 from crosbymichael/solaris
Remove solaris from travis
2017-09-14 15:23:05 -07:00
Michael Crosby
6d440dc223 Remove solaris from travis
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-14 16:29:00 -04:00
Kenfe-Mickaël Laventure
63654f911f Merge pull request #1509 from crosbymichael/ns-event
Set ctx ns before publish
2017-09-14 12:34:03 -07:00
Phil Estes
d1e11f17ec Merge pull request #1465 from AkihiroSuda/gcr
remotes/docker: add scope (registry:foo/bar:pull)
2017-09-14 11:22:26 -07:00
Michael Crosby
14c36cca60 Set ctx ns before publish
Fixes #1497

This sets the namespace on the context when deleting a namespace so that
the publish event does not fail.  Use the same namespace as you are
deleting for the context.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-14 13:54:57 -04:00
Michael Crosby
9f28040426 Merge pull request #1506 from dmcgowan/unpack-manifest-list
Support for multi-arch image unpacking
2017-09-14 13:13:33 -04:00
Derek McGowan
46ded63f2d
Support for multi-arch image unpacking
Resolves the platform on multi-arch manifests during unpack and config resolving.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-09-14 09:32:37 -07:00
Michael Crosby
cc75a112d7 Merge pull request #1484 from yanxuean/loadconfig
Improve server.LoadConfig function
2017-09-14 11:10:32 -04:00
Derek McGowan
49437711c3 Merge pull request #1504 from stevvooe/resolve-platforms
cmd/ctr: show resolved image platform
2017-09-13 15:47:53 -07:00
Kenfe-Mickaël Laventure
0f6d1d21b2 Merge pull request #1501 from crosbymichael/trap-err
Trap close error on shutdown
2017-09-13 14:04:32 -07:00
Kenfe-Mickaël Laventure
bcfdbb13ee Merge pull request #1503 from crosbymichael/update-runc
Update runc to 593914b8bd5448a93f7c3e4902a03408b6d
2017-09-13 14:03:24 -07:00
Stephen J Day
ea8adf9021
cmd/ctr: show resolved image platform
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-09-13 12:41:55 -07:00
Phil Estes
37d049d264 Merge pull request #1493 from mikebrow/seccomp-helper
Add seccomp helpers
2017-09-13 12:00:19 -07:00
Derek McGowan
8785f3f002 Merge pull request #1403 from stevvooe/platform-selectors
platforms: define selectors for platforms
2017-09-13 11:50:11 -07:00
Stephen J Day
775f7cea47
platforms: update format for platform specifier
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-09-13 11:41:45 -07:00
Michael Crosby
77f699ccc7 Update runc to 593914b8bd5448a93f7c3e4902a03408b6d
This bumps runc to the newest version as of this date.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-13 14:24:24 -04:00
Mike Brown
426650f21b adds seccomp helpers
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-09-13 13:11:30 -05:00
Michael Crosby
03b43acd60 Trap close error on shutdown
Fixes #1499

This traps any Accept() errors on server shutdown so that it exits
cleanly.

It also changes gracefulstop to stop on the grpc server as the daemon
will not shutdown if there are connected clients.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-13 13:43:45 -04:00
Michael Crosby
558b46f26e Merge pull request #1502 from crosbymichael/test-image
[tmp] Use amd64 test image
2017-09-13 13:43:19 -04:00
Derek McGowan
0e616f4d7a Merge pull request #1496 from kunalkushwaha/movefile-testcase
Testcase added for Moving files in snapshot layers
2017-09-13 10:41:32 -07:00
Michael Crosby
ca3f16c510 [tmp] Use amd64 test image
This is a workaround because official images were pushed with multi-arch
support recently and the current Pull code is not accounting for this.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-13 13:31:52 -04:00
Kunal Kushwaha
8442e4bbe3 Testcase added for Moving files in snapshot layers
Movement of files/folder from base layer to folder in
new layer should be allowed

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2017-09-12 10:05:32 +09:00
Michael Crosby
a2aa4ecdc0 Merge pull request #1485 from AkihiroSuda/expose-differ
differ: expose newWalkingDiff() for standalone buildkit
2017-09-11 14:31:16 -04:00
Phil Estes
313cebc578 Merge pull request #1473 from kunalkushwaha/snapshot-testcases
Two Snapshot testcases added
2017-09-11 14:24:44 -04:00