Use mirrored images for all Docker image references by pawelchcki · Pull Request #317 · DataDog/nginx-datadog

pawelchcki · 2026-03-06T22:21:06Z

Switch Docker image references to registry.ddbuild.io/ci/nginx-datadog/mirror/ mirrors in CI to avoid rate limits
Add MIRROR_REGISTRY build-arg to Dockerfiles (defaults to mirror; empty for GHA public images)
Add build-step retries in test/bin/run.py for transient Docker build failures

Copilot

Pull request overview

This PR updates CI, build, and example/test artifacts to pull Docker images from the internal registry.ddbuild.io/ci/nginx-datadog/tests/images/ mirror (instead of public registries) to reduce rate limiting and external dependencies, and introduces a MIRROR_REGISTRY build-arg for the musl toolchain build image.

Changes:

Replace public Docker image references across GitLab CI, Dockerfiles, and docker-compose files with mirrored registry.ddbuild.io references.
Add MIRROR_REGISTRY build-arg support to build_env/Dockerfile and thread it through the local toolchain build target in Makefile.
Update GitHub Actions system-tests workflow to set MIRROR_REGISTRY="" (public pulls) and adjust shellcheck job file selection.

Reviewed changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
`test/services/client/Dockerfile`	Switch client service base image to mirrored registry.
`test/Dockerfile`	Switch test runner base + uv stage image to mirrored registry.
`injection/ingress-nginx/docker-compose.yaml`	Switch testagent and nginx images to mirrored registry.
`example/tracing/services/client/Dockerfile`	Switch example client base image to mirrored registry.
`example/tracing/docker-compose.yml`	Switch Datadog agent image reference to mirrored registry.
`example/openresty/services/client/Dockerfile`	Switch example client base image to mirrored registry.
`example/openresty/docker-compose.yml`	Switch Datadog agent image reference to mirrored registry.
`example/ingress-nginx/test-application.yaml`	Switch echo-server image to mirrored registry.
`example/ingress-nginx/helm/values.yaml`	Update ingress-nginx extra module image reference to mirrored registry (but currently malformed).
`build_env/Dockerfile`	Add `MIRROR_REGISTRY` arg; pull `uv` and `alpine` via mirror and copy from the `uv` stage.
`Makefile`	Pass `MIRROR_REGISTRY` build-arg to local toolchain build when provided.
`.gitlab/common.yml`	Update test job image arguments to mirrored registry.
`.gitlab/build-and-test-fast.yml`	Use mirrored base images in matrix; adjust shellcheck file selection.
`.gitlab/build-and-test-all.yml`	Use mirrored base images in the full test matrix.
`.github/workflows/system-tests.yml`	Set `MIRROR_REGISTRY=""` for GHA build job to use public registries.

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

example/ingress-nginx/helm/values.yaml

example/openresty/docker-compose.yml

example/tracing/docker-compose.yml

example/ingress-nginx/test-application.yaml

codecov-commenter · 2026-03-10T12:40:04Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 68.85%. Comparing base (69b4e6d) to head (94281b2).

Additional details and impacted files

@@           Coverage Diff           @@
##           master     #317   +/-   ##
=======================================
  Coverage   68.85%   68.85%           
=======================================
  Files          56       56           
  Lines        7471     7471           
  Branches     1058     1058           
=======================================
  Hits         5144     5144           
  Misses       1820     1820           
  Partials      507      507

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

xlamorlette-datadog · 2026-03-10T14:05:34Z

@pawelchcki

I added some improvements to this PR. But this PR introduces some new flakiness in tests, so I will pause my work on this.
I suggest to simplify registry.ddbuild.io/ci/nginx-datadog/tests/images in registry.ddbuild.io/ci/nginx-datadog, but I think this requires to conjointly modify Mirror public images to internal registry #313 for the CI tests to pass.

pawelchcki · 2026-03-10T14:51:35Z

I suggest to simplify registry.ddbuild.io/ci/nginx-datadog/tests/images in registry.ddbuild.io/ci/nginx-datadog, but I think this requires to conjointly modify #313 for the CI tests to pass.

What do you have in mind ? just a shorter URL ?

- Migrate all Docker image references to use registry.ddbuild.io mirrors - Factorize and simplify registry usage across CI and test configs - Fix OpenResty detection for mirrored base images - Ensure examples are usable outside Datadog internal infrastructure - Add build-step retries in run.py for transient failures - Increase npm fetch-retries in Dockerfiles - Remove CircleCI configuration

Copilot

Pull request overview

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

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

.gitlab/common.yml

build_env/Dockerfile

xlamorlette-datadog

Please wait for the on-going delivery (v1.13.0) to be completed before merging this.

test/bin/run.py

test/Dockerfile

build_env/Dockerfile

- Remove trailing '/' from MIRROR_REGISTRY; use ${MIRROR_REGISTRY}/... syntax for readability (build_env/Dockerfile, test/Dockerfile) - Use ARG MIRROR_REGISTRY pattern in test/Dockerfile instead of hardcoding the registry, matching the build_env/Dockerfile convention - Simplify run_cmd_with_retries: remove redundant outer try/except and finally block so failure doesn't print both "BUILD FAILED" and "Build step finished" (test/bin/run.py) - Remove duplicate .test-nginx-rum block that was overriding the mirrored-image version (.gitlab/common.yml)

The no-trailing-slash style breaks when MIRROR_REGISTRY is set to "" (used in GHA for public images), producing invalid refs like "FROM /alpine:3.20.3". The trailing '/' convention handles both cases: - Default: "registry.ddbuild.io/.../mirror/alpine:3.20.3" - Empty: "alpine:3.20.3"

pawelchcki · 2026-03-12T17:04:15Z

Thanks Xavier!

pawelchcki mentioned this pull request Mar 6, 2026

Mirror public images to internal registry #313

Draft

pawelchcki marked this pull request as ready for review March 6, 2026 22:35

pawelchcki requested a review from a team as a code owner March 6, 2026 22:35

pawelchcki requested review from dmehala and removed request for a team March 6, 2026 22:35

Copilot AI review requested due to automatic review settings March 10, 2026 12:18

Copilot started reviewing on behalf of xlamorlette-datadog March 10, 2026 12:19 View session

Copilot AI reviewed Mar 10, 2026

View reviewed changes

example/ingress-nginx/helm/values.yaml Show resolved Hide resolved

example/openresty/docker-compose.yml Show resolved Hide resolved

example/tracing/docker-compose.yml Show resolved Hide resolved

example/ingress-nginx/test-application.yaml Show resolved Hide resolved

xlamorlette-datadog force-pushed the use_mirrored_images branch 2 times, most recently from 1c9770e to 145d16c Compare March 10, 2026 13:45

pawelchcki force-pushed the use_mirrored_images branch from 10c6e76 to 92b2a12 Compare March 10, 2026 15:18

pawelchcki force-pushed the use_mirrored_images branch from 8f91483 to 5803576 Compare March 10, 2026 15:30

pawelchcki added 2 commits March 10, 2026 16:38

Merge origin/master into use_mirrored_images

0c18a24

Rename mirrored image registry path from tests/images to mirror

e5f314a

pawelchcki requested review from Copilot and xlamorlette-datadog March 10, 2026 15:42

Copilot started reviewing on behalf of pawelchcki March 10, 2026 15:43 View session

Copilot AI reviewed Mar 10, 2026

View reviewed changes

.gitlab/common.yml Show resolved Hide resolved

.gitlab/common.yml Show resolved Hide resolved

build_env/Dockerfile Show resolved Hide resolved

xlamorlette-datadog mentioned this pull request Mar 10, 2026

Use pre-built uwsgi Docker image for tests #318

Merged

xlamorlette-datadog approved these changes Mar 11, 2026

View reviewed changes

test/bin/run.py Outdated Show resolved Hide resolved

test/bin/run.py Outdated Show resolved Hide resolved

test/Dockerfile Outdated Show resolved Hide resolved

build_env/Dockerfile Show resolved Hide resolved

pawelchcki and others added 4 commits March 12, 2026 15:55

Format test/bin/run.py

25ac550

Merge branch 'master' into use_mirrored_images

94281b2

pawelchcki merged commit b9e382b into master Mar 12, 2026
158 checks passed

pawelchcki deleted the use_mirrored_images branch March 12, 2026 17:05

Conversation

pawelchcki commented Mar 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov-commenter commented Mar 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

xlamorlette-datadog commented Mar 10, 2026

Uh oh!

pawelchcki commented Mar 10, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

xlamorlette-datadog left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pawelchcki commented Mar 12, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

pawelchcki commented Mar 6, 2026 •

edited

Loading

codecov-commenter commented Mar 10, 2026 •

edited

Loading