airship/airshipctl
Code Issues Proposed changes

Merge "Pass HostNetwork value to docker container"

Browse Source
This commit is contained in:
Zuul 2021-04-07 19:13:06 +00:00 committed by Gerrit Code Review
commit 7bc47c8a34
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/container/api.go
View File

@ -151,11 +151,12 @@ func (c *clientV1Alpha1) runAirship() error {
c.conf.Spec.Image,
c.conf.Spec.Airship.Cmd)
err = cont.RunCommand(RunCommandOptions{
Privileged: c.conf.Spec.Airship.Privileged,
Cmd: c.conf.Spec.Airship.Cmd,
Mounts: convertDockerMount(c.conf.Spec.StorageMounts),
EnvVars: envs,
Input: decoratedInput,
Privileged: c.conf.Spec.Airship.Privileged,
Cmd: c.conf.Spec.Airship.Cmd,
Mounts: convertDockerMount(c.conf.Spec.StorageMounts),
EnvVars: envs,
Input: decoratedInput,
HostNetwork: c.conf.Spec.HostNetwork,
})
if err != nil {
return err

2
pkg/container/container.go
View File

@ -51,7 +51,7 @@ type Container interface {
// RunCommandOptions options for RunCommand
type RunCommandOptions struct {
Privileged bool
HostNewtork bool
HostNetwork bool
Cmd []string
EnvVars []string

2
pkg/container/container_docker.go
View File

@ -202,7 +202,7 @@ func (c *DockerContainer) getConfig(opts RunCommandOptions) (container.Config, c
Mounts: mounts,
Privileged: opts.Privileged,
}
if opts.HostNewtork {
if opts.HostNetwork {
hCfg.NetworkMode = "host"
}
return cCfg, hCfg, nil