Skip to content

fix(e2e): replace mcr.microsoft.com references with ghcr.io/devsy-org test images #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skevetter merged 2 commits into from
May 6, 2026
Merged

fix(e2e): replace mcr.microsoft.com references with ghcr.io/devsy-org test images #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0ca195
fix(e2e): replace mcr.microsoft.com references with ghcr.io/devsy-org…
skevetter May 6, 2026
65def79
fix(e2e): use base:ubuntu for dotnet example fixture
skevetter May 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/build-multi-stage/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/devcontainers/go:1.22-bullseye AS go
FROM ghcr.io/devsy-org/test-images/go:1 AS go

ARG TARGETOS
ARG TARGETARCH
Expand Down
2 changes: 1 addition & 1 deletion examples/build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM mcr.microsoft.com/devcontainers/go:1.22-bullseye
FROM ghcr.io/devsy-org/test-images/go:1

ARG TARGETOS
ARG TARGETARCH
Expand Down
2 changes: 1 addition & 1 deletion examples/compose/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM mcr.microsoft.com/devcontainers/go:1.22-bullseye AS go
FROM ghcr.io/devsy-org/test-images/go:1 AS go

ARG TARGETOS
ARG TARGETARCH
Expand Down
2 changes: 1 addition & 1 deletion examples/compose/devcontainer.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/devcontainers/go:1.22-bullseye AS go
FROM ghcr.io/devsy-org/test-images/go:1 AS go

ARG TARGETOS
ARG TARGETARCH
Expand Down
2 changes: 1 addition & 1 deletion examples/compose/devcontainer.Dockerfile2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM mcr.microsoft.com/devcontainers/base:ubuntu
FROM ghcr.io/devsy-org/test-images/base:ubuntu
RUN echo test
2 changes: 1 addition & 1 deletion examples/multi-devcontainer/.devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{ "image": "mcr.microsoft.com/devcontainers/base:ubuntu", "build": {} }
{ "image": "ghcr.io/devsy-org/test-images/base:ubuntu", "build": {} }
2 changes: 1 addition & 1 deletion examples/multi-devcontainer/proj1/.devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "Python 3",
"image": "mcr.microsoft.com/vscode/devcontainers/python:0-3"
"image": "ghcr.io/devsy-org/test-images/python:latest"
}
2 changes: 1 addition & 1 deletion examples/multi-devcontainer/proj2/.devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "Go",
"image": "mcr.microsoft.com/vscode/devcontainers/go:0-1.19-bullseye"
"image": "ghcr.io/devsy-org/test-images/go:1"
}
2 changes: 1 addition & 1 deletion examples/object-lifecycle-hooks/.devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Object-Lifecycle",
"image": "mcr.microsoft.com/vscode/devcontainers/go:1",
"image": "ghcr.io/devsy-org/test-images/go:1",
"postStartCommand": {
"cobra-install": "go install github.com/spf13/cobra-cli@latest",
"golangci-lint": "go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest",
Expand Down
4 changes: 2 additions & 2 deletions examples/simple/.devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/dotnet
{
"name": "C# (.NET)",
"name": "Simple Example",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/dotnet:1-8.0",
"image": "ghcr.io/devsy-org/test-images/base:ubuntu",

// Features to add to the dev container. More info: https://containers.dev/features.
"features": {
Expand Down
2 changes: 1 addition & 1 deletion pkg/dockerfile/test_Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/devcontainers/go:1.22-bullseye
FROM ghcr.io/devsy-org/test-images/go:1

ARG TARGETOS
ARG TARGETARCH
Expand Down
4 changes: 2 additions & 2 deletions pkg/image/error_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
)

func makeTransportErrorWithBody(statusCode int, body string) error {
req, _ := http.NewRequest("GET", "https://mcr.microsoft.com/v2/", nil)
req, _ := http.NewRequest("GET", "https://ghcr.io/v2/devsy-org/test-images/", nil)
resp := &http.Response{
StatusCode: statusCode,
Body: io.NopCloser(strings.NewReader(body)),
Expand All @@ -24,7 +24,7 @@ func makeTransportErrorWithBody(statusCode int, body string) error {
func TestSanitizeRegistryError_HTMLBody(t *testing.T) {
htmlBody := `<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"><html><body><h1>403 Forbidden</h1></body></html>`
inner := makeTransportErrorWithBody(http.StatusForbidden, htmlBody)
wrapped := fmt.Errorf("retrieve image mcr.microsoft.com/devcontainers/base:ubuntu: %w", inner)
wrapped := fmt.Errorf("retrieve image ghcr.io/devsy-org/test-images/base:ubuntu: %w", inner)

sanitized := SanitizeRegistryError(wrapped)
if sanitized == wrapped {
Expand Down
Loading