Commit771b3b7

committed

chore: pass env variables + remove accidental commit

1 parent6896dcb commit771b3b7Copy full SHA for 771b3b7

File tree

+10

-9

lines changed

+10

-9

lines changed

Lines changed: 8 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1146,12 +1146,14 @@ func (api *API) maybeInjectSubAgentIntoContainerLocked(ctx context.Context, dc c`
`1146`	`1146`
`1147`	`1147`	`varapps []SubAgentApp`
`1148`	`1148`
`1149`		`-ifconfig,err:=api.dccli.ReadConfig(ctx,dc.WorkspaceFolder,dc.ConfigPath, []string{`
`1150`		`-fmt.Sprintf("CODER_AGENT_NAME=%s",dc.Name),`
`1151`		`-fmt.Sprintf("CODER_USER_NAME=%s",api.userName),`
`1152`		`-fmt.Sprintf("CODER_WORKSPACE_NAME=%s",api.workspaceName),`
`1153`		`-fmt.Sprintf("CODER_DEPLOYMENT_URL=%s",api.subAgentURL),`
`1154`		`-});err!=nil {`
	`1149`	`+ifconfig,err:=api.dccli.ReadConfig(ctx,dc.WorkspaceFolder,dc.ConfigPath,`
	`1150`	`+[]string{`
	`1151`	`+fmt.Sprintf("CODER_WORKSPACE_AGENT_NAME=%s",dc.Name),`
	`1152`	`+fmt.Sprintf("CODER_WORKSPACE_OWNER_NAME=%s",api.userName),`
	`1153`	`+fmt.Sprintf("CODER_WORKSPACE_NAME=%s",api.workspaceName),`
	`1154`	`+fmt.Sprintf("CODER_DEPLOYMENT_URL=%s",api.subAgentURL),`
	`1155`	`+},`
	`1156`	`+);err!=nil {`
`1155`	`1157`	`api.logger.Error(ctx,"unable to read devcontainer config",slog.Error(err))`
`1156`	`1158`	`}else {`
`1157`	`1159`	`coderCustomization:=config.MergedConfiguration.Customizations.Coder`

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)