diff options
| author | Jhon Honce <jhonce@redhat.com> | 2020-11-16 16:11:31 -0700 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2020-11-23 15:20:39 -0600 |
| commit | 44da01f45cd941f44d2025864c91b0d2942d2a20 (patch) | |
| tree | bb37a31fd4dbf0032cdb94c3d2ea1652908be91a /pkg/api/handlers/types.go | |
| parent | cd6c4cb0affdb1e8a647079b2808da6bf833d543 (diff) | |
| download | podman-44da01f45cd941f44d2025864c91b0d2942d2a20.tar.gz podman-44da01f45cd941f44d2025864c91b0d2942d2a20.tar.bz2 podman-44da01f45cd941f44d2025864c91b0d2942d2a20.zip | |
Refactor compat container create endpoint
* Make endpoint compatibile with docker-py network expectations
* Update specgen helper when called from compat endpoint
* Update godoc on types
* Add test for network/container create using docker-py method
* Add syslog logging when DEBUG=1 for tests
Fixes #8361
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'pkg/api/handlers/types.go')
| -rw-r--r-- | pkg/api/handlers/types.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go index 6bb5f5101..40cf16807 100644 --- a/pkg/api/handlers/types.go +++ b/pkg/api/handlers/types.go @@ -110,11 +110,12 @@ type ContainerWaitOKBody struct { } } +// CreateContainerConfig used when compatible endpoint creates a container type CreateContainerConfig struct { - Name string - dockerContainer.Config - HostConfig dockerContainer.HostConfig - NetworkingConfig dockerNetwork.NetworkingConfig + Name string // container name + dockerContainer.Config // desired container configuration + HostConfig dockerContainer.HostConfig // host dependent configuration for container + NetworkingConfig dockerNetwork.NetworkingConfig // network configuration for container } // swagger:model IDResponse @@ -253,7 +254,7 @@ func ImageDataToImageInspect(ctx context.Context, l *libpodImage.Image) (*ImageI // StdinOnce: false, Env: info.Config.Env, Cmd: info.Config.Cmd, - //Healthcheck: l.ImageData.HealthCheck, + // Healthcheck: l.ImageData.HealthCheck, // ArgsEscaped: false, // Image: "", Volumes: info.Config.Volumes, @@ -261,7 +262,7 @@ func ImageDataToImageInspect(ctx context.Context, l *libpodImage.Image) (*ImageI Entrypoint: info.Config.Entrypoint, // NetworkDisabled: false, // MacAddress: "", - //OnBuild: info.Config.OnBuild, + // OnBuild: info.Config.OnBuild, Labels: info.Labels, StopSignal: info.Config.StopSignal, // StopTimeout: nil, |