Skip to content

chore(ci) sync devcontainer template from dd-repo-tools#79

Merged
pawelchcki merged 3 commits into
mainfrom
campaigner/sync-dd-repo-tools
May 11, 2026
Merged

chore(ci) sync devcontainer template from dd-repo-tools#79
pawelchcki merged 3 commits into
mainfrom
campaigner/sync-dd-repo-tools

Conversation

@gh-worker-campaigns-3e9aa4
Copy link
Copy Markdown
Contributor

Syncs the shared devcontainer template from dd-repo-tools:

  • .devcontainer/devcontainer.mk (make fragment — hashing, local dev targets)
  • .gitlab/devcontainer.yml (CI template — devcontainer build/cache job)

Both files are verbatim copies — edits here will be overwritten
on the next campaigner run. Edit upstream in dd-repo-tools instead.

The mirror_images wrapper will follow once the
publish-content-addressable-repository-tools GitLab job is wired
up in dd-repo-tools.

Wiring

Your .gitlab-ci.yml needs a DEVCONTAINER_REPO_NAME: <this-repo>
variable and include: - local: .gitlab/devcontainer.yml to pull
in the devcontainer pipeline, plus two sidecars you own:
.devcontainer/Dockerfile and .devcontainer/context.files (rsync
--files-from list).

Source: https://github.com/DataDog/dd-repo-tools/tree/main/shared/devcontainer

Recent changes:

  • Initial campaigner-driven sync from dd-repo-tools.
  • make and rsync are baked into the bootstrap image (no apt-get on every run).

@datadog-datadog-prod-us1

This comment has been minimized.

@pawelchcki pawelchcki marked this pull request as ready for review May 11, 2026 11:59
@pawelchcki pawelchcki requested a review from a team as a code owner May 11, 2026 11:59
@pawelchcki pawelchcki requested review from Anilm3 and Copilot and removed request for a team May 11, 2026 11:59
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Syncs the shared DataDog dd-repo-tools devcontainer CI/template into this repository to standardize devcontainer build, caching, and tagging behavior across repos.

Changes:

  • Adds a shared GitLab CI template job to build/push (and optionally per-arch build) a devcontainer image and emit ci-image.env.
  • Adds a Makefile fragment to stage a minimal devcontainer build context and compute a stable content-hash tag, reused by both CI and local workflows.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.

File Description
.gitlab/devcontainer.yml Introduces the devcontainer CI job that stages context via make, computes the image tag, cache-checks, builds, and nydus-converts on cache miss.
.devcontainer/devcontainer.mk Provides shared staging + hashing logic and local helper targets (dev-image, dev-shell, etc.) used by the CI template.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread .gitlab/devcontainer.yml
Comment thread .gitlab/devcontainer.yml Outdated
Comment thread .devcontainer/devcontainer.mk Outdated
@pawelchcki pawelchcki requested review from pawelchcki May 11, 2026 12:11
@pawelchcki
Copy link
Copy Markdown
Contributor

This PR is based on - #60 (which meant to merge to main, but graphite merged it to a temporary branch instead)

@pawelchcki pawelchcki merged commit 9e8833d into main May 11, 2026
5 checks passed
@pawelchcki pawelchcki deleted the campaigner/sync-dd-repo-tools branch May 11, 2026 12:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants