A toolkit for building secure, portable and lean operating systems for containers
Go to file
Ian Campbell a5a3b778c0 More granular merge of Runtime from labels & yaml
Previously any Runtime specified in yml would completely override anything from
the image label, even if they set distinct fields. This pushes the merging down
to the next layer, and in the case of BindNS down two layers.

Most of the fields involved needed to become pointers to support this, which
required a smattering of other changes to cope. As well as the local test suite
this has been put through the linuxkit test suite (as of cc200d296a).

I also tested in the scenario which caused me to file #152.

Fixes #152.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-22 13:18:36 +01:00
cmd/moby Rename "output" to "format" 2017-09-01 23:45:25 +01:00
docs Correct example yaml 2017-09-18 15:13:32 +01:00
examples Merge pull request #149 from justincormack/shared-init 2017-09-18 18:10:08 -07:00
pkg/init-container update init for containers for recent changes 2017-08-10 14:57:53 +01:00
src More granular merge of Runtime from labels & yaml 2017-09-22 13:18:36 +01:00
test Add Cgroup resource limits into Yaml spec 2017-08-09 16:39:10 +01:00
vendor Bump to image-spec v1.0.0 and runtime-spec v1.0.0 2017-07-20 12:23:09 +01:00
.gitignore Fix gitignore to not ignore moby directory 2017-05-26 14:45:19 +01:00
circle.yml Makefile: Update for ease of Homebrew installation 2017-07-14 10:03:44 +01:00
CONTRIBUTING.md Move Contributing to top level 2017-07-14 11:50:51 +01:00
LICENSE Add license files 2017-04-24 23:08:30 +01:00
Makefile Rename "output" to "format" 2017-09-01 23:45:25 +01:00
NOTICE Add license files 2017-04-24 23:08:30 +01:00
vendor.conf Bump to image-spec v1.0.0 and runtime-spec v1.0.0 2017-07-20 12:23:09 +01:00