mirror of
https://github.com/containers/podman.git
synced 2025-06-02 02:26:52 +08:00
InfraContainer Rework
InfraContainer should go through the same creation process as regular containers. This change was from the cmd level down, involving new container CLI opts and specgen creating functions. What now happens is that both container and pod cli options are populated in cmd and used to create a podSpecgen and a containerSpecgen. The process then goes as follows FillOutSpecGen (infra) -> MapSpec (podOpts -> infraOpts) -> PodCreate -> MakePod -> createPodOptions -> NewPod -> CompleteSpec (infra) -> MakeContainer -> NewContainer -> newContainer -> AddInfra (to pod state) Signed-off-by: cdoern <cdoern@redhat.com>
This commit is contained in:
34
pkg/specgenutil/createparse.go
Normal file
34
pkg/specgenutil/createparse.go
Normal file
@ -0,0 +1,34 @@
|
||||
package specgenutil
|
||||
|
||||
import (
|
||||
"github.com/containers/common/pkg/config"
|
||||
"github.com/containers/podman/v3/pkg/domain/entities"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
// validate determines if the flags and values given by the user are valid. things checked
|
||||
// by validate must not need any state information on the flag (i.e. changed)
|
||||
func validate(c *entities.ContainerCreateOptions) error {
|
||||
var ()
|
||||
if c.Rm && (c.Restart != "" && c.Restart != "no" && c.Restart != "on-failure") {
|
||||
return errors.Errorf(`the --rm option conflicts with --restart, when the restartPolicy is not "" and "no"`)
|
||||
}
|
||||
|
||||
if _, err := config.ParsePullPolicy(c.Pull); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var imageVolType = map[string]string{
|
||||
"bind": "",
|
||||
"tmpfs": "",
|
||||
"ignore": "",
|
||||
}
|
||||
if _, ok := imageVolType[c.ImageVolume]; !ok {
|
||||
if c.IsInfra {
|
||||
c.ImageVolume = "bind"
|
||||
} else {
|
||||
return errors.Errorf("invalid image-volume type %q. Pick one of bind, tmpfs, or ignore", c.ImageVolume)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
Reference in New Issue
Block a user