Skip to content

Introduce support for docker commit #37

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
ndeloof merged 1 commit into from
Aug 4, 2022
Merged

Introduce support for docker commit #37

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion builder/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ type Backend interface {

// CommitBuildStep creates a new Docker image from the config generated by
// a build step.
CommitBuildStep(backend.CommitConfig) (image.ID, error)
CommitBuildStep(context.Context, backend.CommitConfig) (image.ID, error)
// ContainerCreateWorkdir creates the workdir
ContainerCreateWorkdir(containerID string) error

Expand Down
4 changes: 2 additions & 2 deletions builder/dockerfile/dispatchers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ func dispatchWorkdir(ctx context.Context, d dispatchRequest, c *instructions.Wor
return err
}

return d.builder.commitContainer(d.state, containerID, runConfigWithCommentCmd)
return d.builder.commitContainer(ctx, d.state, containerID, runConfigWithCommentCmd)
}

// RUN some command yo
Expand Down Expand Up @@ -390,7 +390,7 @@ func dispatchRun(ctx context.Context, d dispatchRequest, c *instructions.RunComm
runConfigForCacheProbe.ArgsEscaped = stateRunConfig.ArgsEscaped
}

return d.builder.commitContainer(d.state, cID, runConfigForCacheProbe)
return d.builder.commitContainer(ctx, d.state, cID, runConfigForCacheProbe)
}

// Derive the command to use for probeCache() and to commit in this container.
Expand Down
6 changes: 3 additions & 3 deletions builder/dockerfile/internals.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ func (b *Builder) commit(ctx context.Context, dispatchState *dispatchState, comm
return err
}

return b.commitContainer(dispatchState, id, runConfigWithCommentCmd)
return b.commitContainer(ctx, dispatchState, id, runConfigWithCommentCmd)
}

func (b *Builder) commitContainer(dispatchState *dispatchState, id string, containerConfig *container.Config) error {
func (b *Builder) commitContainer(ctx context.Context, dispatchState *dispatchState, id string, containerConfig *container.Config) error {
if b.disableCommit {
return nil
}
Expand All @@ -103,7 +103,7 @@ func (b *Builder) commitContainer(dispatchState *dispatchState, id string, conta
ContainerID: id,
}

imageID, err := b.docker.CommitBuildStep(commitCfg)
imageID, err := b.docker.CommitBuildStep(ctx, commitCfg)
dispatchState.imageID = string(imageID)
return err
}
Expand Down
2 changes: 1 addition & 1 deletion builder/dockerfile/mockbackend_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func (m *MockBackend) ContainerRm(name string, config *types.ContainerRmConfig)
return nil
}

func (m *MockBackend) CommitBuildStep(c backend.CommitConfig) (image.ID, error) {
func (m *MockBackend) CommitBuildStep(ctx context.Context, c backend.CommitConfig) (image.ID, error) {
if m.commitFunc != nil {
return m.commitFunc(c)
}
Expand Down
2 changes: 1 addition & 1 deletion daemon/commit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func (daemon *Daemon) CreateImageFromContainer(ctx context.Context, name string,
return "", err
}

id, err := daemon.imageService.CommitImage(backend.CommitConfig{
id, err := daemon.imageService.CommitImage(ctx, backend.CommitConfig{
Author: c.Author,
Comment: c.Comment,
Config: newConfig,
Expand Down
4 changes: 2 additions & 2 deletions daemon/containerd/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func (i *ImageService) GetContainerdImage(ctx context.Context, refOrID string, p

// GetImage returns an image corresponding to the image referred to by refOrID.
func (i *ImageService) GetImage(ctx context.Context, refOrID string, options imagetype.GetImageOpts) (*image.Image, error) {
ii, img, err := i.getImage(ctx, refOrID, options.Platform)
ii, img, err := i.getImage(ctx, refOrID)
if err != nil {
return nil, err
}
Expand All @@ -49,7 +49,7 @@ func (i *ImageService) GetImage(ctx context.Context, refOrID string, options ima
return img, err
}

func (i *ImageService) getImage(ctx context.Context, refOrID string, platform *ocispec.Platform) (containerd.Image, *image.Image, error) {
func (i *ImageService) getImage(ctx context.Context, refOrID string) (containerd.Image, *image.Image, error) {
desc, err := i.ResolveImage(ctx, refOrID)
if err != nil {
return nil, nil, err
Expand Down
Loading