diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-17 16:51:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 16:51:51 +0200 |
| commit | 78ad57ebd35acac59ffa6c7b8231ffaf9e0c1f7a (patch) | |
| tree | dbc59dfdb4533b7558c8e2dede2ccea339297f3e /pkg/specgen/generate/container_create.go | |
| parent | 200afe7a942b294401714980502b80a549b92fb1 (diff) | |
| parent | c51c593ff630719d9d897319a7afabf412580d68 (diff) | |
| download | podman-78ad57ebd35acac59ffa6c7b8231ffaf9e0c1f7a.tar.gz podman-78ad57ebd35acac59ffa6c7b8231ffaf9e0c1f7a.tar.bz2 podman-78ad57ebd35acac59ffa6c7b8231ffaf9e0c1f7a.zip | |
Merge pull request #6636 from mheon/add_warnings
Re-add resource limit warnings to Specgen
Diffstat (limited to 'pkg/specgen/generate/container_create.go')
| -rw-r--r-- | pkg/specgen/generate/container_create.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index 33075b543..869601e93 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -16,7 +16,9 @@ import ( "github.com/sirupsen/logrus" ) -// MakeContainer creates a container based on the SpecGenerator +// MakeContainer creates a container based on the SpecGenerator. +// Returns the created, container and any warnings resulting from creating the +// container, or an error. func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGenerator) (*libpod.Container, error) { rtc, err := rt.GetConfig() if err != nil { |