- Notifications
You must be signed in to change notification settings - Fork925
feat(agent/agentcontainers): implement ignore customization for devcontainers#18530
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
mafredri merged 5 commits intomainfrommafredri/feat-agent-enable-devcontainers-by-defaultJun 24, 2025
Merged
feat(agent/agentcontainers): implement ignore customization for devcontainers#18530
mafredri merged 5 commits intomainfrommafredri/feat-agent-enable-devcontainers-by-defaultJun 24, 2025
+294 −43
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| @@ -1077,7 +1145,8 @@ func (api *API) maybeInjectSubAgentIntoContainerLocked(ctx context.Context, dc c | |||
| // Container ID changed or the subagent process is not running, | |||
| // stop the existing subagent context to replace it. | |||
| proc.stop() | |||
| }else { | |||
| } | |||
| ifproc.agent.OperatingSystem=="" { | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Review: Drive-by bug fix.
| // if _, err := api.ccli.ExecAs(ctx, container.ID, "root", "setcap", "cap_net_admin+ep", coderPathInsideContainer); err != nil { | ||
| // logger.Warn(ctx, "set CAP_NET_ADMIN on agent binary failed", slog.Error(err)) | ||
| // } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Review: Shifted downward so we don't touch ignored containers.
DanielleMaywood approved these changesJun 24, 2025
johnstcn approved these changesJun 24, 2025
1138e1f to5f1d7fbCompare5d3681c tof01711aComparee443f86 intomain 34 checks passed
Uh oh!
There was an error while loading.Please reload this page.
Sign up for freeto subscribe to this conversation on GitHub. Already have an account?Sign in.
Labels
None yet
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading.Please reload this page.
This turned out to be a bit more tricky than I had anticipated. In my mind we must treat the ignore field differently than we have treated
devcontainer.jsonbefore.Previously, in rough terms, the
devcontainer.jsonis "manifested" once for a container, and re-evaluated upon detecting a new container (recreation).But if a user has a container running and wants to start ignoring it, it would be confusing if they had to "recreate" the devcontainer for it to disappear.
Fixescoder/internal#737