Skip to content

Preserve Dockerfile devcontainer.metadata during image build#1225

Open
RossBugginsNHS wants to merge 3 commits into
devcontainers:mainfrom
RossBugginsNHS:fix/preserve-user-dockerfile-metadata
Open

Preserve Dockerfile devcontainer.metadata during image build#1225
RossBugginsNHS wants to merge 3 commits into
devcontainers:mainfrom
RossBugginsNHS:fix/preserve-user-dockerfile-metadata

Conversation

@RossBugginsNHS
Copy link
Copy Markdown

Attribution

Submitted by Ross Buggins after interactive investigation and drafting assistance from GitHub Copilot. The changes and PR content were reviewed and submitted by the author, not posted by an unattended bot.

Summary

This PR preserves user-declared Dockerfile devcontainer.metadata during CLI image-build metadata computation so that final effective metadata composition does not drop user image metadata entries.

Related Discussion

Spec/proposal issue:

Fork issue used during preparation:

Problem

Expected

If a Dockerfile includes LABEL devcontainer.metadata=..., those entries should survive CLI build composition and be merged with base image, feature, and config-derived metadata.

Actual

In affected Dockerfile build paths, especially feature-enabled ones, the final effective devcontainer.metadata can exclude metadata declared directly in the user Dockerfile.

Impact

This can silently remove runtime-relevant configuration encoded in metadata, including examples like:

  • mounts
  • lifecycle hooks such as postCreateCommand
  • other merged configuration fields expected to persist through image extension

Root Cause

internalGetImageBuildInfoFromDockerfile(...) derived metadata from the resolved base image, but did not reliably merge metadata declared directly in Dockerfile LABEL devcontainer.metadata=... instructions into the metadata set later used for final wrapper/feature label generation.

What This PR Changes

1. Preserve Dockerfile label metadata in Dockerfile build-info extraction

File:

  • src/spec-node/imageMetadata.ts

Changes:

  • Parse devcontainer.metadata values from Dockerfile LABEL instructions.
  • Merge parsed Dockerfile metadata with existing base-image metadata during internalGetImageBuildInfoFromDockerfile(...).

2. Reuse shared metadata JSON parsing

File:

  • src/spec-node/imageMetadata.ts

Changes:

  • Extract shared metadata parsing logic so image-label parsing and Dockerfile-label parsing use the same JSON handling path.

3. Add regression tests

File:

  • src/test/dockerfileUtils.test.ts

Added tests:

  • preserves metadata declared in Dockerfile labels
  • parses metadata declared with a quoted label key

These verify that Dockerfile-declared metadata is present in both raw and substituted metadata returned by internalGetImageBuildInfoFromDockerfile(...).

Validation

Executed locally:

  • Targeted tests:
    • mocha -r ts-node/register --exit src/test/dockerfileUtils.test.ts
    • Result: 71 passing
  • Lint:
    • eslint src/spec-node/imageMetadata.ts src/test/dockerfileUtils.test.ts
    • Result: clean
  • Type-check:
    • npm run type-check
    • Result: success

Why This Is Safe

  • Scope is narrow and limited to Dockerfile metadata extraction/merge in the image-build info path.
  • No public CLI contract or flag behavior changes.
  • Regression coverage added around the new behavior.

Notes

This PR is intended to align implementation with the expected metadata-composition behavior. If maintainers would prefer to settle semantics first in the spec discussion, this PR can still serve as a concrete implementation reference and regression test basis.

## Summary
This PR fixes a metadata regression where `devcontainer build` could produce a final effective `devcontainer.metadata` label that excluded user-declared metadata from the Dockerfile.

Target for this PR is **my fork's `main` branch** so it can be used as a fully documented staging PR before opening upstream.

## Problem Statement
### Expected
User-provided Dockerfile metadata (`LABEL devcontainer.metadata=...`) should be preserved and merged with feature/runtime metadata in the final effective label.

### Actual
In affected build paths (especially feature-enabled paths), metadata assembly used base-image metadata but did not reliably include user Dockerfile label metadata in the final computed metadata payload.

### Impact
Runtime-critical config encoded in metadata (for example mounts and lifecycle hooks) can be silently dropped from effective container configuration.

## Root Cause (Code Path)
1. Dockerfile build flow computes metadata via `internalGetImageBuildInfoFromDockerfile(...)`.
2. That path used `findBaseImage(...)` + `inspectDockerImage(baseImage)` and parsed image label metadata from the resolved base image.
3. User metadata from Dockerfile label instructions was not merged into the computed metadata set used downstream for wrapper/feature label generation.

## What Changed
### 1) Preserve Dockerfile label metadata during image build info computation
File: `src/spec-node/imageMetadata.ts`

- In `internalGetImageBuildInfoFromDockerfile(...)`:
  - Keep existing base image metadata extraction.
  - Parse `LABEL devcontainer.metadata=...` entries from Dockerfile text.
  - Merge parsed Dockerfile metadata entries with base metadata (`base + dockerfile`) before downstream merge/composition.

### 2) Reuse shared parsing logic
File: `src/spec-node/imageMetadata.ts`

- Extracted shared metadata JSON parse helper used by both:
  - image-label parsing (`internalGetImageMetadata0`), and
  - Dockerfile label parsing.

### 3) Add regression tests
File: `src/test/dockerfileUtils.test.ts`

Added tests under `getImageBuildInfo`:
- `preserves metadata declared in Dockerfile labels`
- `parses metadata declared with a quoted label key`

These assert user Dockerfile metadata is present in `info.metadata.raw` (and substituted metadata in `info.metadata.config`) after `internalGetImageBuildInfoFromDockerfile(...)`.

## Validation Performed
- Targeted tests:
  - `mocha -r ts-node/register --exit src/test/dockerfileUtils.test.ts`
  - Result: **71 passing, 0 failing**
- Lint:
  - `eslint src/spec-node/imageMetadata.ts src/test/dockerfileUtils.test.ts`
  - Result: clean
- Type-check:
  - `npm run type-check`
  - Result: success

## Why This Is Safe
- Scope is limited to metadata extraction/merge in Dockerfile build-info path.
- No changes to public CLI arguments or command behavior outside metadata assembly.
- Regression tests added for the new behavior and edge case label key quoting.

## Upstream Follow-Up Notes
When opening upstream PR to `devcontainers/cli`:
1. Reuse this PR body sections directly (Problem, Root Cause, Changes, Validation).
2. Include your externally observed reproduction matrix (feature + metadata-bearing base, feature + plain base, etc.).
3. Keep focus on spec-intended composition behavior: preserve user metadata, append/merge feature/runtime metadata.
4. Optional follow-up tests (integration-level) can assert final built image inspect output includes both user marker metadata and feature metadata.

## Commit
- `b34a404` - Preserve Dockerfile devcontainer.metadata during image build
@RossBugginsNHS RossBugginsNHS requested a review from a team as a code owner May 13, 2026 09:44
@microsoft-github-policy-service
Copy link
Copy Markdown

@RossBugginsNHS please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.

@microsoft-github-policy-service agree [company="{your company}"]

Options:

  • (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
  • (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"
Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”),
and conveys certain license rights to Microsoft Corporation and its affiliates (“Microsoft”) for Your
contributions to Microsoft open source projects. This Agreement is effective as of the latest signature
date below.

  1. Definitions.
    “Code” means the computer software code, whether in human-readable or machine-executable form,
    that is delivered by You to Microsoft under this Agreement.
    “Project” means any of the projects owned or managed by Microsoft and offered under a license
    approved by the Open Source Initiative (www.opensource.org).
    “Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
    Project, including but not limited to communication on electronic mailing lists, source code control
    systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
    discussing and improving that Project, but excluding communication that is conspicuously marked or
    otherwise designated in writing by You as “Not a Submission.”
    “Submission” means the Code and any other copyrightable material Submitted by You, including any
    associated comments and documentation.
  2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any
    Project. This Agreement covers any and all Submissions that You, now or in the future (except as
    described in Section 4 below), Submit to any Project.
  3. Originality of Work. You represent that each of Your Submissions is entirely Your original work.
    Should You wish to Submit materials that are not Your original work, You may Submit them separately
    to the Project if You (a) retain all copyright and license information that was in the materials as You
    received them, (b) in the description accompanying Your Submission, include the phrase “Submission
    containing materials of a third party:” followed by the names of the third party and any licenses or other
    restrictions of which You are aware, and (c) follow any other instructions in the Project’s written
    guidelines concerning Submissions.
  4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else
    for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
    Submission is made in the course of Your work for an employer or Your employer has intellectual
    property rights in Your Submission by contract or applicable law, You must secure permission from Your
    employer to make the Submission before signing this Agreement. In that case, the term “You” in this
    Agreement will refer to You and the employer collectively. If You change employers in the future and
    desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
    and secure permission from the new employer before Submitting those Submissions.
  5. Licenses.
  • Copyright License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license in the
    Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute
    the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third
    parties.
  • Patent License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under
    Your patent claims that are necessarily infringed by the Submission or the combination of the
    Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
    import or otherwise dispose of the Submission alone or with the Project.
  • Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
    No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
    granted by implication, exhaustion, estoppel or otherwise.
  1. Representations and Warranties. You represent that You are legally entitled to grant the above
    licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
    have disclosed under Section 3). You represent that You have secured permission from Your employer to
    make the Submission in cases where Your Submission is made in the course of Your work for Your
    employer or Your employer has intellectual property rights in Your Submission by contract or applicable
    law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
    have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
    You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
    REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
    EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
    PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
    NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
  2. Notice to Microsoft. You agree to notify Microsoft in writing of any facts or circumstances of which
    You later become aware that would make Your representations in this Agreement inaccurate in any
    respect.
  3. Information about Submissions. You agree that contributions to Projects and information about
    contributions may be maintained indefinitely and disclosed publicly, including Your name and other
    information that You submit with Your Submission.
  4. Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and
    the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County,
    Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to
    exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all
    defenses of lack of personal jurisdiction and forum non-conveniens.
  5. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
    supersedes any and all prior agreements, understandings or communications, written or oral, between
    the parties relating to the subject matter hereof. This Agreement may be assigned by Microsoft.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant