Skip to content

Add ExposedPorts and Volumes to the image returned #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rumpl merged 1 commit into from
Aug 19, 2022
Merged

Add ExposedPorts and Volumes to the image returned #68

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions daemon/containerd/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/docker/docker/errdefs"
"github.com/docker/docker/image"
"github.com/docker/docker/layer"
"github.com/docker/go-connections/nat"
"github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"
Expand Down Expand Up @@ -43,6 +44,9 @@ func (i *ImageService) GetImage(ctx context.Context, refOrID string, options ima
}

tagged, err := i.client.ImageService().List(ctx, fmt.Sprintf("target.digest==%s", ii.Target().Digest.String()))
if err != nil {
return nil, err
}
tags := make([]reference.Named, 0, len(tagged))
for _, i := range tagged {
name, err := reference.ParseNamed(i.Name)
Expand Down Expand Up @@ -98,17 +102,23 @@ func (i *ImageService) getImage(ctx context.Context, refOrID string) (containerd
for _, id := range fs {
rootfs.Append(layer.DiffID(id))
}
exposedPorts := make(nat.PortSet, len(ociimage.Config.ExposedPorts))
for k, v := range ociimage.Config.ExposedPorts {
exposedPorts[nat.Port(k)] = v
}
return ii, &image.Image{
V1Image: image.V1Image{
ID: string(desc.Digest),
OS: ociimage.OS,
Architecture: ociimage.Architecture,
Config: &containertypes.Config{
Entrypoint: ociimage.Config.Entrypoint,
Env: ociimage.Config.Env,
Cmd: ociimage.Config.Cmd,
User: ociimage.Config.User,
WorkingDir: ociimage.Config.WorkingDir,
Entrypoint: ociimage.Config.Entrypoint,
Env: ociimage.Config.Env,
Cmd: ociimage.Config.Cmd,
User: ociimage.Config.User,
WorkingDir: ociimage.Config.WorkingDir,
ExposedPorts: exposedPorts,
Volumes: ociimage.Config.Volumes,
},
},
RootFS: rootfs,
Expand Down