Skip to content

Avoid overlayfs on /var/tmp/cvd and /tmp not to be blocked by disk I/O #535

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

Draft
0405ysj wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −2
Draft

Avoid overlayfs on /var/tmp/cvd and /tmp not to be blocked by disk I/O #535

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
12 changes: 10 additions & 2 deletions pkg/app/instances/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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,
Expand All @@ -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
Expand Down
Loading