Repository navigation
Conversation
…icting "name" was line 2, sitting directly on top of the build block. It is the only per-repo value in this file, so it is the only line we ever edit here -- and it happens to sit next to the block that churns most upstream. git cannot split adjacent hunks, so every `pixi run update-from-template-repo` came back with a conflict on this one file. Measured on blooop/dbw: reverting only the name line made the same merge run clean. Moving the name to the end of the object turns the two edits into two separate hunks, and they merge without help. Also fixes the value. It read "python_template", which names a different project entirely; pyproject.toml has said "rockerc" all along. That is the signature of a past template merge resolving this exact conflict the wrong way -- taking the template's side of the name line. Now set to "rockerc". Deliberately unchanged in this repo: - the Dockerfile - "features": docker-in-docker:2, which this repo needs and the shared template image does not provide. This repo is not being synced to python_template's image.
Contributor
Reviewer's guide (collapsed on small PRs)Reviewer's GuideUpdates File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #153 +/- ##
=======================================
Coverage 63.00% 63.00%
=======================================
Files 8 8
Lines 1768 1768
=======================================
Hits 1114 1114
Misses 654 654 🚀 New features to boost your workflow:
|
Synced from blooop/python_template. postCreateCommand now calls .devcontainer/post-create.sh. The script runs `pixi run <task>` only where the task is actually defined, and seeds known_hosts with ssh-keyscan for whatever host origin points at. devpod forwards an ssh agent, so the host's ~/.ssh does not need mounting -- but the agent carries authentication, not host identity, and on a fresh container the first git operation over an ssh remote died with "Host key verification failed". Interactive users can click through that; scripts, agents and in-container CI cannot.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Moves
"name"from line 2 to the last key in.devcontainer/devcontainer.json, and fixes its value.Why move it.
"name"is the only per-repo value in this file, and it sat directly above thebuildblock -- the block that changes most when the template updates. git cannot split adjacent hunks, so everypixi run update-from-template-repoconflicted here. Measured onblooop/dbw: reverting only the name line made the same merge clean. At the end of the object the two edits are separate hunks and merge on their own.Value fix. The name read
python_template-- the name of a different project.pyproject.tomlhas saidrockercall along, so the devcontainer was the one out of step, most likely from a past template merge resolving this very conflict the wrong way. Set torockerc.This repo is deliberately NOT being synced to python_template's shared image. Unlike the 18 repos in the other batches, its Dockerfile and features are load-bearing:
features:docker-in-docker:2Nothing else in the file changed. Verified: still parses as JSONC,
nameis last with valuerockerc, and the parsed object is otherwise key-for-key and value-for-value identical to the original -- the only value difference isnameitself.🤖 Generated with Claude Code
Summary by Sourcery
Improve devcontainer initialization and make its repository-specific configuration safer to merge with template updates.
New Features:
Bug Fixes:
rockerc.Enhancements: