Commit8b379a9

committed

chore: more changes

1 parente4bafc6 commit8b379a9Copy full SHA for 8b379a9

File tree

+13

-4

lines changed

+13

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ func (d *devcontainerCLI) ReadConfig(ctx context.Context, workspaceFolder, confi`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`c:=d.execer.CommandContext(ctx,"devcontainer",args...)`
`267`		`-c.Env=append(c.Env,env...)`
	`267`	`+//c.Env = append(c.Env, env...)`
`268`	`268`
`269`	`269`	`varstdoutBuf bytes.Buffer`
`270`	`270`	`stdoutWriters:= []io.Writer{&stdoutBuf,&devcontainerCLILogWriter{ctx:ctx,logger:logger.With(slog.F("stdout",true))}}`

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,17 @@ func (a *agent) apiHandler(aAPI proto.DRPCAgentClient26) (http.Handler, func() e`
`50`	`50`	`}`
`51`	`51`	`manifest:=a.manifest.Load()`
`52`	`52`	`ifmanifest!=nil&&len(manifest.Devcontainers)>0 {`
`53`		`-containerAPIOpts=append(`
`54`		`-containerAPIOpts,`
`55`		`-agentcontainers.WithDevcontainers(manifest.Devcontainers,manifest.Scripts),`
	`53`	`+containerAPIOpts=append(containerAPIOpts,`
	`54`	`+agentcontainers.WithUserName(manifest.OwnerName),`
	`55`	`+agentcontainers.WithWorkspaceName(manifest.WorkspaceName),`
`56`	`56`	`)`
	`57`	`+`
	`58`	`+iflen(manifest.Devcontainers)>0 {`
	`59`	`+containerAPIOpts=append(`
	`60`	`+containerAPIOpts,`
	`61`	`+agentcontainers.WithDevcontainers(manifest.Devcontainers,manifest.Scripts),`
	`62`	`+)`
	`63`	`+}`
`57`	`64`	`}`
`58`	`65`
`59`	`66`	`// Append after to allow the agent options to override the default options.`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,8 @@ export const Workspace: FC<WorkspaceProps> = ({`
`99`	`99`	`constshouldShowProvisionerAlert=`
`100`	`100`	`workspacePending&&!haveBuildLogs&&!provisionersHealthy&&!isRestarting;`
`101`	`101`
	`102`	`+console.log(selectedResource?.agents);`
	`103`	`+`
`102`	`104`	`return(`
`103`	`105`	`<div`
`104`	`106`	`css={{`

Comments

(0)