spindle/engines/nixery: make $HOME a separate directory #451

merged

opened by

winter.bsky.social 4 months ago targeting master from winter.bsky.social/core: push-luoyqwkpromz

Otherwise, when programs create files in $HOME, others that check the Git repo's state may be sad (or at least emit warnings in response to) it being dirty.

Signed-off-by: Winter winter@winter.cafe

options

unified split

Changed files

+3 -2

spindle

engines

nixery

engine.go

+3 -2

spindle/engines/nixery/engine.go

···

       29
        
       

     

       30
        
       const (

     

       31
        
       	workspaceDir = "/tangled/workspace"

     

       0
        
       
     

       32
        
       )

     

       33
        
       

     

       34
        
       type cleanupFunc func(context.Context) error

     
···

       243
        
       	}

     

       244
        
       

     

       245
        
       	mkExecResp, err := e.docker.ContainerExecCreate(ctx, resp.ID, container.ExecOptions{

     

       246
       -
       		Cmd:          []string{"mkdir", "-p", workspaceDir},

     

       247
        
       		AttachStdout: true, // NOTE(winter): pretty sure this will make it so that when stdout read is done below, mkdir is done. maybe??

     

       248
        
       		AttachStderr: true, // for good measure, backed up by docker/cli ("If -d is not set, attach to everything by default")

     

       249
        
       	})

     
···

       302
        
       	for k, v := range step.environment {

     

       303
        
       		envs.AddEnv(k, v)

     

       304
        
       	}

     

       305
       -
       	envs.AddEnv("HOME", workspaceDir)

     

       306
        
       	e.l.Debug("envs for step", "step", step.Name, "envs", envs.Slice())

     

       307
        
       

     

       308
        
       	mkExecResp, err := e.docker.ContainerExecCreate(ctx, addl.container, container.ExecOptions{

···

       29
        
       

     

       30
        
       const (

     

       31
        
       	workspaceDir = "/tangled/workspace"

     

       32
       +
       	homeDir      = "/tangled/home"

     

       33
        
       )

     

       34
        
       

     

       35
        
       type cleanupFunc func(context.Context) error

     
···

       244
        
       	}

     

       245
        
       

     

       246
        
       	mkExecResp, err := e.docker.ContainerExecCreate(ctx, resp.ID, container.ExecOptions{

     

       247
       +
       		Cmd:          []string{"mkdir", "-p", workspaceDir, homeDir},

     

       248
        
       		AttachStdout: true, // NOTE(winter): pretty sure this will make it so that when stdout read is done below, mkdir is done. maybe??

     

       249
        
       		AttachStderr: true, // for good measure, backed up by docker/cli ("If -d is not set, attach to everything by default")

     

       250
        
       	})

     
···

       303
        
       	for k, v := range step.environment {

     

       304
        
       		envs.AddEnv(k, v)

     

       305
        
       	}

     

       306
       +
       	envs.AddEnv("HOME", homeDir)

     

       307
        
       	e.l.Debug("envs for step", "step", step.Name, "envs", envs.Slice())

     

       308
        
       

     

       309
        
       	mkExecResp, err := e.docker.ContainerExecCreate(ctx, addl.container, container.ExecOptions{