Skip to content

Commit 83cee39

Browse files
committed
fix: change signature of build
1 parent 29d2c5d commit 83cee39

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

cluster/calcium/build.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,9 @@ func (c *Calcium) BuildImage(ctx context.Context, opts *types.BuildOptions) (ch
3838
)
3939
switch opts.BuildMethod {
4040
case types.BuildFromSCM:
41-
refs = node.Engine.BuildRefs(ctx, toBuildRefOptions(opts))
42-
resp, err = c.buildFromSCM(ctx, node, refs, opts)
41+
refs, resp, err = c.buildFromSCM(ctx, node, opts)
4342
case types.BuildFromRaw:
44-
refs = node.Engine.BuildRefs(ctx, toBuildRefOptions(opts))
45-
resp, err = c.buildFromContent(ctx, node, refs, opts.Tar)
43+
refs, resp, err = c.buildFromContent(ctx, node, opts)
4644
case types.BuildFromExist:
4745
refs, node, resp, err = c.buildFromExist(ctx, opts)
4846
default:
@@ -75,7 +73,7 @@ func (c *Calcium) selectBuildNode(ctx context.Context) (*types.Node, error) {
7573
return node, err
7674
}
7775

78-
func (c *Calcium) buildFromSCM(ctx context.Context, node *types.Node, refs []string, opts *types.BuildOptions) (io.ReadCloser, error) {
76+
func (c *Calcium) buildFromSCM(ctx context.Context, node *types.Node, opts *types.BuildOptions) ([]string, io.ReadCloser, error) {
7977
buildContentOpts := &enginetypes.BuildContentOptions{
8078
User: opts.User,
8179
UID: opts.UID,
@@ -84,14 +82,16 @@ func (c *Calcium) buildFromSCM(ctx context.Context, node *types.Node, refs []str
8482
path, content, err := node.Engine.BuildContent(ctx, c.source, buildContentOpts)
8583
defer os.RemoveAll(path)
8684
if err != nil {
87-
return nil, errors.WithStack(err)
85+
return nil, nil, errors.WithStack(err)
8886
}
89-
return c.buildFromContent(ctx, node, refs, content)
87+
opts.Tar = content
88+
return c.buildFromContent(ctx, node, opts)
9089
}
9190

92-
func (c *Calcium) buildFromContent(ctx context.Context, node *types.Node, refs []string, content io.Reader) (io.ReadCloser, error) {
93-
resp, err := node.Engine.ImageBuild(ctx, content, refs)
94-
return resp, errors.WithStack(err)
91+
func (c *Calcium) buildFromContent(ctx context.Context, node *types.Node, opts *types.BuildOptions) ([]string, io.ReadCloser, error) {
92+
refs := node.Engine.BuildRefs(ctx, toBuildRefOptions(opts))
93+
resp, err := node.Engine.ImageBuild(ctx, opts.Tar, refs)
94+
return refs, resp, errors.WithStack(err)
9595
}
9696

9797
func (c *Calcium) buildFromExist(ctx context.Context, opts *types.BuildOptions) (refs []string, node *types.Node, resp io.ReadCloser, err error) {

0 commit comments

Comments
 (0)