containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

create: move validate after setting default ns 

validate the configuration only after we set the default namespaces.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2020-04-24 10:46:30 +02:00
parent 81c7a2444c
commit 36039a38ea
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/specgen/generate/container_create.go
View File

@ -15,9 +15,6 @@ import (
// MakeContainer creates a container based on the SpecGenerator
func MakeContainer(rt *libpod.Runtime, s *specgen.SpecGenerator) (*libpod.Container, error) {
if err := s.Validate(); err != nil {
return nil, errors.Wrap(err, "invalid config provided")
}
rtc, err := rt.GetConfig()
if err != nil {
return nil, err
@ -94,6 +91,10 @@ func MakeContainer(rt *libpod.Runtime, s *specgen.SpecGenerator) (*libpod.Contai
options = append(options, libpod.WithRootFSFromImage(newImage.ID(), s.Image, s.RawImageName))
if err := s.Validate(); err != nil {
return nil, errors.Wrap(err, "invalid config provided")
}
runtimeSpec, err := SpecGenToOCI(s, rt, newImage)
if err != nil {
return nil, err