Fix conda image git builds (os-provided) and refresh dev container lock files.#1922
Merged
Merged
Conversation
Copilot created this pull request from a session on behalf of
Kaniska244
June 30, 2026 11:35
View session
Contributor
|
@copilot Refresh the lock files again by following the steps as earlier. |
Contributor
Author
Kaniska244
approved these changes
Jul 1, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This PR refreshes devcontainer lockfiles across all image folders and adjusts conda-based devcontainer configuration to avoid broken git-from-source installs by switching the git feature to use the OS-provided git.
Changes:
- Regenerated
src/*/.devcontainer/devcontainer-lock.jsonfiles, updating pinned feature digests/versions (notablyghcr.io/devcontainers/features/git:1to1.3.7;oryx:2also updates inuniversal). - Updated
src/anaconda/.devcontainer/devcontainer.jsonandsrc/miniconda/.devcontainer/devcontainer.jsonto set the git feature optionversion: "os-provided". - Bumped image versions and README tag examples for
anacondaandminiconda(manifest.json+README.md).
Show a summary per file
| File | Description |
|---|---|
| src/universal/.devcontainer/devcontainer-lock.json | Regenerated lockfile; updates git feature pin and oryx feature pin. |
| src/typescript-node/.devcontainer/devcontainer-lock.json | Regenerated lockfile; updates git feature pin. |
| src/rust/.devcontainer/devcontainer-lock.json | Regenerated lockfile; updates git feature pin. |
| src/ruby/.devcontainer/devcontainer-lock.json | Regenerated lockfile; updates git feature pin. |
| src/python/.devcontainer/devcontainer-lock.json | Regenerated lockfile; updates git feature pin. |
| src/php/.devcontainer/devcontainer-lock.json | Regenerated lockfile; updates git feature pin. |
| src/miniconda/README.md | Updates example tag to match the new miniconda manifest version. |
| src/miniconda/manifest.json | Bumps miniconda image version. |
| src/miniconda/.devcontainer/devcontainer.json | Switches git feature option to OS-provided git for miniconda devcontainer. |
| src/miniconda/.devcontainer/devcontainer-lock.json | Regenerated lockfile; updates git feature pin. |
| src/jekyll/.devcontainer/devcontainer-lock.json | Regenerated lockfile; updates git feature pin. |
| src/javascript-node/.devcontainer/devcontainer-lock.json | Regenerated lockfile; updates git feature pin. |
| src/java/.devcontainer/devcontainer-lock.json | Regenerated lockfile; updates git feature pin. |
| src/java-8/.devcontainer/devcontainer-lock.json | Regenerated lockfile; updates git feature pin. |
| src/go/.devcontainer/devcontainer-lock.json | Regenerated lockfile; updates git feature pin. |
| src/dotnet/.devcontainer/devcontainer-lock.json | Regenerated lockfile; updates git feature pin. |
| src/cpp/.devcontainer/devcontainer-lock.json | Regenerated lockfile; updates git feature pin. |
| src/base-ubuntu/.devcontainer/devcontainer-lock.json | Regenerated lockfile; updates git feature pin. |
| src/base-debian/.devcontainer/devcontainer-lock.json | Regenerated lockfile; updates git feature pin. |
| src/base-alpine/.devcontainer/devcontainer-lock.json | Regenerated lockfile; updates git feature pin. |
| src/anaconda/README.md | Updates example tag to match the new anaconda manifest version. |
| src/anaconda/manifest.json | Bumps anaconda image version. |
| src/anaconda/.devcontainer/devcontainer.json | Switches git feature option to OS-provided git for anaconda devcontainer. |
| src/anaconda/.devcontainer/devcontainer-lock.json | Regenerated lockfile; updates git feature pin. |
Review details
- Files reviewed: 24/24 changed files
- Comments generated: 4
- Review effort level: Low
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
abdurriq
approved these changes
Jul 1, 2026
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.
Summary
This PR does two related things:
gitsource builds on the conda-based images (anaconda,miniconda) by switching thegitfeature from a source-based install (latest+ppa: false) to the OS-provided package (os-provided).devcontainer-lock.json, bumpinggit(1.3.5 → 1.3.7) andoryx(2.0.0 → 2.0.1).Root cause: why
gitfails to build on conda imagesSince git 2.51.0 (Aug 2025), building
gitfrom source has been broken on theanacondaandminicondaimages, it only discovered now because it used to fail silently so far until changed recently. The failure is aniconvsymbol mismatch caused by conda's presence onPATHat build time.The conda environment ships both the iconv header and a GNU libiconv library:
/opt/conda/include/iconv.h(~9.1K) — the header Git's./configuredetects./opt/conda/lib/libiconv.so → libiconv.so.2.6.1— GNU libiconv, whose symbols arelibiconv_open/libiconv_close.The conda Dockerfile prepends conda to
PATHbefore the git feature runs:So the build breaks like this:
configure/Makefilefinds conda's/opt/conda/include/iconv.h, which is a separate iconv header, and therefore setsNEEDS_LIBICONV.NEEDS_LIBICONVset, Git emits calls to the GNU libiconv symbol nameslibiconv_open/libiconv_close.-L/opt/conda/lib -liconv.iconvas built-ins (not those symbol names) →undefined referencetolibiconv_open/libiconv_close.base-debiannever sees/opt/conda, so it links cleanly against glibc — which is why only the conda images are affected.Fix
Pin the
gitfeature toos-providedforanacondaandminiconda. This installs the distro-packaged git instead of compiling from source, sidestepping the condaiconv.h/ glibc mismatch entirely. An inline comment documents why the override exists so it isn't accidentally reverted:Changes
1. Conda image
gitfix (anaconda,miniconda)gitfeature config indevcontainer.jsonfrom:anaconda:1.3.20→1.3.21miniconda:1.2.8→1.2.92. Lockfile refresh (all images)
Regenerated the
devcontainer-lock.jsonfiles across all images, updating the pinned feature digests:ghcr.io/devcontainers/features/git:1:1.3.5→1.3.7ghcr.io/devcontainers/features/oryx:2:2.0.0→2.0.1(universalimage only)"ghcr.io/devcontainers/features/git:1": { - "version": "1.3.5", - "resolved": "ghcr.io/devcontainers/features/git@sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251", - "integrity": "sha256:27905dc196c01f77d6ba8709cb82eeaf330b3b108772e2f02d1cd0d826de1251" + "version": "1.3.7", + "resolved": "ghcr.io/devcontainers/features/git@sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a", + "integrity": "sha256:a3e43ff91b9f5f6bd2c14bd510d43e5e698f1266dc41027ba4e04e7e45be607a" }Affected images
anaconda,base-alpine,base-debian,base-ubuntu,cpp,dotnet,go,java,java-8,javascript-node,jekyll,miniconda,php,python,ruby,rust,typescript-node,universalFiles changed (24 files, +69 / −65)
src/{anaconda,miniconda}/.devcontainer/devcontainer.jsongittoos-provided+ explanatory commentsrc/{anaconda,miniconda}/manifest.jsonsrc/{anaconda,miniconda}/README.mdsrc/*/.devcontainer/devcontainer-lock.json(18 images)git(andoryxforuniversal) digestsTesting / Validation
anacondaandminicondaimages build successfully withgitinstalled viaos-provided.gitis available and functional in the built conda images.