Add support for stdin_open in composefile v3
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
parent
bc739a8d70
commit
84450b72cd
|
@ -33,6 +33,7 @@ type ContainerSpec struct {
|
||||||
User string `json:",omitempty"`
|
User string `json:",omitempty"`
|
||||||
Groups []string `json:",omitempty"`
|
Groups []string `json:",omitempty"`
|
||||||
TTY bool `json:",omitempty"`
|
TTY bool `json:",omitempty"`
|
||||||
|
OpenStdin bool `json:",omitempty"`
|
||||||
Mounts []mount.Mount `json:",omitempty"`
|
Mounts []mount.Mount `json:",omitempty"`
|
||||||
StopGracePeriod *time.Duration `json:",omitempty"`
|
StopGracePeriod *time.Duration `json:",omitempty"`
|
||||||
Healthcheck *container.HealthConfig `json:",omitempty"`
|
Healthcheck *container.HealthConfig `json:",omitempty"`
|
||||||
|
|
|
@ -505,6 +505,7 @@ func convertService(
|
||||||
Mounts: mounts,
|
Mounts: mounts,
|
||||||
StopGracePeriod: service.StopGracePeriod,
|
StopGracePeriod: service.StopGracePeriod,
|
||||||
TTY: service.Tty,
|
TTY: service.Tty,
|
||||||
|
OpenStdin: service.StdinOpen,
|
||||||
},
|
},
|
||||||
Resources: resources,
|
Resources: resources,
|
||||||
RestartPolicy: restartPolicy,
|
RestartPolicy: restartPolicy,
|
||||||
|
|
|
@ -24,6 +24,7 @@ func containerSpecFromGRPC(c *swarmapi.ContainerSpec) types.ContainerSpec {
|
||||||
User: c.User,
|
User: c.User,
|
||||||
Groups: c.Groups,
|
Groups: c.Groups,
|
||||||
TTY: c.TTY,
|
TTY: c.TTY,
|
||||||
|
OpenStdin: c.OpenStdin,
|
||||||
Hosts: c.Hosts,
|
Hosts: c.Hosts,
|
||||||
Secrets: secretReferencesFromGRPC(c.Secrets),
|
Secrets: secretReferencesFromGRPC(c.Secrets),
|
||||||
}
|
}
|
||||||
|
@ -133,6 +134,7 @@ func containerToGRPC(c types.ContainerSpec) (*swarmapi.ContainerSpec, error) {
|
||||||
User: c.User,
|
User: c.User,
|
||||||
Groups: c.Groups,
|
Groups: c.Groups,
|
||||||
TTY: c.TTY,
|
TTY: c.TTY,
|
||||||
|
OpenStdin: c.OpenStdin,
|
||||||
Hosts: c.Hosts,
|
Hosts: c.Hosts,
|
||||||
Secrets: secretReferencesToGRPC(c.Secrets),
|
Secrets: secretReferencesToGRPC(c.Secrets),
|
||||||
}
|
}
|
||||||
|
|
|
@ -185,6 +185,7 @@ func (c *containerConfig) config() *enginecontainer.Config {
|
||||||
config := &enginecontainer.Config{
|
config := &enginecontainer.Config{
|
||||||
Labels: c.labels(),
|
Labels: c.labels(),
|
||||||
Tty: c.spec().TTY,
|
Tty: c.spec().TTY,
|
||||||
|
OpenStdin: c.spec().OpenStdin,
|
||||||
User: c.spec().User,
|
User: c.spec().User,
|
||||||
Env: c.spec().Env,
|
Env: c.spec().Env,
|
||||||
Hostname: c.spec().Hostname,
|
Hostname: c.spec().Hostname,
|
||||||
|
|
Loading…
Reference in New Issue