dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-07-11 18:13:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon/cluster/executor/container: use consistent alias for import

Browse Source 
The canonical alias is "containertypes" for this import.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2024-06-18 11:14:01 +02:00
parent f09f756851
commit 25f44885ed
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
daemon/cluster/executor/container/container.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/containerd/log"
"github.com/distribution/reference"
enginecontainer "github.com/docker/docker/api/types/container"
containertypes "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/events"
"github.com/docker/docker/api/types/filters"
enginemount "github.com/docker/docker/api/types/mount"
@@ -160,7 +160,7 @@ func (c *containerConfig) portBindings() nat.PortMap {
return portBindings
}
func (c *containerConfig) isolation() enginecontainer.Isolation {
func (c *containerConfig) isolation() containertypes.Isolation {
return convert.IsolationFromGRPC(c.spec().Isolation)
}
@@ -190,11 +190,11 @@ func (c *containerConfig) exposedPorts() map[nat.Port]struct{} {
return exposedPorts
}
func (c *containerConfig) config() *enginecontainer.Config {
func (c *containerConfig) config() *containertypes.Config {
genericEnvs := genericresource.EnvFormat(c.task.AssignedGenericResources, "DOCKER_RESOURCE")
env := append(c.spec().Env, genericEnvs...)
config := &enginecontainer.Config{
config := &containertypes.Config{
Labels: c.labels(),
StopSignal: c.spec().StopSignal,
Tty: c.spec().TTY,
@@ -375,7 +375,7 @@ func convertMount(m api.Mount) enginemount.Mount {
return mount
}
func (c *containerConfig) healthcheck() *enginecontainer.HealthConfig {
func (c *containerConfig) healthcheck() *containertypes.HealthConfig {
hcSpec := c.spec().Healthcheck
if hcSpec == nil {
return nil
@@ -384,7 +384,7 @@ func (c *containerConfig) healthcheck() *enginecontainer.HealthConfig {
timeout, _ := gogotypes.DurationFromProto(hcSpec.Timeout)
startPeriod, _ := gogotypes.DurationFromProto(hcSpec.StartPeriod)
startInterval, _ := gogotypes.DurationFromProto(hcSpec.StartInterval)
return &enginecontainer.HealthConfig{
return &containertypes.HealthConfig{
Test: hcSpec.Test,
Interval: interval,
Timeout: timeout,
@@ -394,8 +394,8 @@ func (c *containerConfig) healthcheck() *enginecontainer.HealthConfig {
}
}
func (c *containerConfig) hostConfig(deps exec.VolumeGetter) *enginecontainer.HostConfig {
hc := &enginecontainer.HostConfig{
func (c *containerConfig) hostConfig(deps exec.VolumeGetter) *containertypes.HostConfig {
hc := &containertypes.HostConfig{
Resources: c.resources(),
GroupAdd: c.spec().Groups,
PortBindings: c.portBindings(),
@@ -432,7 +432,7 @@ func (c *containerConfig) hostConfig(deps exec.VolumeGetter) *enginecontainer.Ho
}
if c.task.LogDriver != nil {
hc.LogConfig = enginecontainer.LogConfig{
hc.LogConfig = containertypes.LogConfig{
Type: c.task.LogDriver.Name,
Config: c.task.LogDriver.Options,
}
@@ -442,7 +442,7 @@ func (c *containerConfig) hostConfig(deps exec.VolumeGetter) *enginecontainer.Ho
labels := c.task.Networks[0].Network.Spec.Annotations.Labels
name := c.task.Networks[0].Network.Spec.Annotations.Name
if v, ok := labels["com.docker.swarm.predefined"]; ok && v == "true" {
hc.NetworkMode = enginecontainer.NetworkMode(name)
hc.NetworkMode = containertypes.NetworkMode(name)
}
}
@@ -474,8 +474,8 @@ func (c *containerConfig) volumeCreateRequest(mount *api.Mount) *volume.CreateOp
return nil
}
func (c *containerConfig) resources() enginecontainer.Resources {
resources := enginecontainer.Resources{}
func (c *containerConfig) resources() containertypes.Resources {
resources := containertypes.Resources{}
// set pids limit
pidsLimit := c.spec().PidsLimit
@@ -672,7 +672,7 @@ func (c *containerConfig) networkCreateRequest(name string) (clustertypes.Networ
}, nil
}
func (c *containerConfig) applyPrivileges(hc *enginecontainer.HostConfig) {
func (c *containerConfig) applyPrivileges(hc *containertypes.HostConfig) {
privileges := c.spec().Privileges
if privileges == nil {
return