Commitbacab01

committed

chore: pass env variables + remove accidental commit

1 parent8b379a9 commitbacab01Copy full SHA for bacab01

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1132,8 +1132,8 @@ func (api *API) injectSubAgentIntoContainerLocked(ctx context.Context, dc coders`
`1132`	`1132`	`dc.WorkspaceFolder,`
`1133`	`1133`	`dc.ConfigPath,`
`1134`	`1134`	`[]string{`
`1135`		`-fmt.Sprintf("CODER_AGENT_NAME=%s",dc.Name),`
`1136`		`-fmt.Sprintf("CODER_USER_NAME=%s",api.userName),`
	`1135`	`+fmt.Sprintf("CODER_WORKSPACE_AGENT_NAME=%s",dc.Name),`
	`1136`	`+fmt.Sprintf("CODER_WORKSPACE_OWNER_NAME=%s",api.userName),`
`1137`	`1137`	`fmt.Sprintf("CODER_WORKSPACE_NAME=%s",api.workspaceName),`
`1138`	`1138`	`fmt.Sprintf("CODER_DEPLOYMENT_URL=%s",api.subAgentURL),`
`1139`	`1139`	`},`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`	`"encoding/json"`
`8`	`8`	`"errors"`
`9`	`9`	`"io"`
	`10`	`+"os"`
`10`	`11`
`11`	`12`	`"golang.org/x/xerrors"`
`12`	`13`
`@@ -264,7 +265,7 @@ func (d *devcontainerCLI) ReadConfig(ctx context.Context, workspaceFolder, confi`
`264`	`265`	`}`
`265`	`266`
`266`	`267`	`c:=d.execer.CommandContext(ctx,"devcontainer",args...)`
`267`		`-//c.Env = append(c.Env, env...)`
	`268`	`+c.Env=append(os.Environ(),env...)`
`268`	`269`
`269`	`270`	`varstdoutBuf bytes.Buffer`
`270`	`271`	`stdoutWriters:= []io.Writer{&stdoutBuf,&devcontainerCLILogWriter{ctx:ctx,logger:logger.With(slog.F("stdout",true))}}`

Lines changed: 0 additions & 2 deletions

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

Comments

(0)