From 40680b2d376b084d1a5248b16c113adfbf120b7f Mon Sep 17 00:00:00 2001 From: dlorenc Date: Tue, 17 Apr 2018 10:42:04 -0700 Subject: [PATCH] Make the setupSeccomp function public. This function is useful for converting from the OCI spec format to the one used by runC/libcontainer. Signed-off-by: dlorenc --- libcontainer/specconv/spec_linux.go | 4 ++-- libcontainer/specconv/spec_linux_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libcontainer/specconv/spec_linux.go b/libcontainer/specconv/spec_linux.go index b02e77d34..32e225967 100644 --- a/libcontainer/specconv/spec_linux.go +++ b/libcontainer/specconv/spec_linux.go @@ -233,7 +233,7 @@ func CreateLibcontainerConfig(opts *CreateOpts) (*configs.Config, error) { config.MountLabel = spec.Linux.MountLabel config.Sysctl = spec.Linux.Sysctl if spec.Linux.Seccomp != nil { - seccomp, err := setupSeccomp(spec.Linux.Seccomp) + seccomp, err := SetupSeccomp(spec.Linux.Seccomp) if err != nil { return nil, err } @@ -736,7 +736,7 @@ func parseMountOptions(options []string) (int, []int, string, int) { return flag, pgflag, strings.Join(data, ","), extFlags } -func setupSeccomp(config *specs.LinuxSeccomp) (*configs.Seccomp, error) { +func SetupSeccomp(config *specs.LinuxSeccomp) (*configs.Seccomp, error) { if config == nil { return nil, nil } diff --git a/libcontainer/specconv/spec_linux_test.go b/libcontainer/specconv/spec_linux_test.go index 9b90efb28..98ffdbf98 100644 --- a/libcontainer/specconv/spec_linux_test.go +++ b/libcontainer/specconv/spec_linux_test.go @@ -123,7 +123,7 @@ func TestSetupSeccomp(t *testing.T) { }, }, } - seccomp, err := setupSeccomp(conf) + seccomp, err := SetupSeccomp(conf) if err != nil { t.Errorf("Couldn't create Seccomp config: %v", err)