move tar writer close

Argus-Labs · Aug 8, 2024 · e4af4bb · e4af4bb
1 parent 2306458
commit e4af4bb
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/common/docker/docker.go b/common/docker/docker.go
@@ -291,9 +291,12 @@ func pullImageIfNotExists(ctx context.Context, cli *client.Client, imageName str
 
 func buildImage(ctx context.Context, cli *client.Client, dockerfile Dockerfile, imageName string) error {
 	fmt.Println("Building image ", imageName)
+
+	// Enable BuildKit via environment variable
+	os.Setenv("DOCKER_BUILDKIT", "1")
+
 	buf := new(bytes.Buffer)
 	tw := tar.NewWriter(buf)
-	defer tw.Close()
 
 	// Add the Dockerfile to the tar archive
 	header := &tar.Header{
@@ -312,6 +315,10 @@ func buildImage(ctx context.Context, cli *client.Client, dockerfile Dockerfile,
 		return err
 	}
 
+	if err := tw.Close(); err != nil {
+		return eris.Wrap(err, "Failed to close tar writer")
+	}
+
 	// Read the tar archive
 	tarReader := bytes.NewReader(buf.Bytes())