From 8593a6926353a1453d36192f020d863dd28487ac Mon Sep 17 00:00:00 2001
From: Seungjae Yoo <seungjaeyoo@google.com>
Date: Tue, 14 Jul 2026 06:15:14 +0000
Subject: [PATCH] Avoid overlayfs on /var/tmp/cvd and /tmp not to be blocked by
 disk I/O

---
 pkg/app/instances/docker.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkg/app/instances/docker.go b/pkg/app/instances/docker.go
index 1cdcd76c..7c512700 100644
--- a/pkg/app/instances/docker.go
+++ b/pkg/app/instances/docker.go
@@ -393,6 +393,14 @@ func (m *DockerInstanceManager) createDockerContainer(ctx context.Context, user
 				Source: uaVolumeName(user),
 				Target: uaMountTarget,
 			},
+			{
+				Type:   mount.TypeVolume,
+				Target: "/var/tmp/cvd",
+			},
+			{
+				Type:   mount.TypeVolume,
+				Target: "/tmp",
+			},
 		},
 		Resources: container.Resources{
 			Devices: []container.DeviceMapping{
@@ -429,7 +437,7 @@ func (m *DockerInstanceManager) createDockerContainer(ctx context.Context, user
 		return "", fmt.Errorf("failed to start docker container: %w", err)
 	}
 	execConfig := container.ExecOptions{
-		Cmd:          []string{"chown", "httpcvd:httpcvd", uaMountTarget},
+		Cmd:          []string{"chown", "httpcvd:httpcvd", uaMountTarget, "/var/tmp/cvd", "/tmp"},
 		AttachStdout: false,
 		AttachStderr: false,
 		Tty:          false,
@@ -453,7 +461,7 @@ func (m *DockerInstanceManager) deleteDockerContainer(ctx context.Context, user
 	if err := m.Client.ContainerStop(ctx, host, container.StopOptions{}); err != nil {
 		return fmt.Errorf("failed to stop docker container: %w", err)
 	}
-	if err := m.Client.ContainerRemove(ctx, host, container.RemoveOptions{}); err != nil {
+	if err := m.Client.ContainerRemove(ctx, host, container.RemoveOptions{RemoveVolumes: true}); err != nil {
 		return fmt.Errorf("failed to remove docker container: %w", err)
 	}
 	return nil