[imgbuilder] Support forceRebuild

csweichel · csweichel · commit 04af15ae47ec · 2021-05-28T08:44:37.000Z
diff --git a/components/image-builder/pkg/orchestrator/orchestrator.go b/components/image-builder/pkg/orchestrator/orchestrator.go
@@ -322,7 +322,7 @@ func (o *Orchestrator) Build(req *protocol.BuildRequest, resp protocol.ImageBuil
 	if err != nil {
 		return status.Errorf(codes.Internal, "cannot check if image is already built: %q", err)
 	}
-	if exists {
+	if exists && !req.GetForceRebuild() {
 		// If the workspace image exists, so should the baseimage if we've built it.
 		// If we didn't build it and the base image doesn't exist anymore, getWorkspaceImageRef will have failed to resolve the baseref.
 		baserefAbsolute, err := o.getAbsoluteImageRef(ctx, baseref, auth.AllowedAuthForAll)

Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ func (o Orchestrator) Build(req protocol.BuildRequest, resp protocol.ImageBuil`
`322`	`322`	`if err != nil {`
`323`	`323`	`return status.Errorf(codes.Internal, "cannot check if image is already built: %q", err)`
`324`	`324`	`}`
`325`		`- if exists {`
	`325`	`+ if exists && !req.GetForceRebuild() {`
`326`	`326`	`// If the workspace image exists, so should the baseimage if we've built it.`
`327`	`327`	`// If we didn't build it and the base image doesn't exist anymore, getWorkspaceImageRef will have failed to resolve the baseref.`
`328`	`328`	`baserefAbsolute, err := o.getAbsoluteImageRef(ctx, baseref, auth.AllowedAuthForAll)`