diff --git a/examples/build-multi-stage/Dockerfile b/examples/build-multi-stage/Dockerfile index d21d67690..27192aa86 100644 --- a/examples/build-multi-stage/Dockerfile +++ b/examples/build-multi-stage/Dockerfile @@ -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 diff --git a/examples/build/Dockerfile b/examples/build/Dockerfile index df87ea4e0..c3b2cff70 100644 --- a/examples/build/Dockerfile +++ b/examples/build/Dockerfile @@ -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 diff --git a/examples/compose/Dockerfile b/examples/compose/Dockerfile index 618365418..34d741487 100644 --- a/examples/compose/Dockerfile +++ b/examples/compose/Dockerfile @@ -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 diff --git a/examples/compose/devcontainer.Dockerfile b/examples/compose/devcontainer.Dockerfile index d21d67690..27192aa86 100644 --- a/examples/compose/devcontainer.Dockerfile +++ b/examples/compose/devcontainer.Dockerfile @@ -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 diff --git a/examples/compose/devcontainer.Dockerfile2 b/examples/compose/devcontainer.Dockerfile2 index 2fcffaf7d..7681c5dbf 100644 --- a/examples/compose/devcontainer.Dockerfile2 +++ b/examples/compose/devcontainer.Dockerfile2 @@ -1,2 +1,2 @@ -FROM mcr.microsoft.com/devcontainers/base:ubuntu +FROM ghcr.io/devsy-org/test-images/base:ubuntu RUN echo test diff --git a/examples/multi-devcontainer/.devcontainer.json b/examples/multi-devcontainer/.devcontainer.json index 7f7998e88..459cb33cb 100644 --- a/examples/multi-devcontainer/.devcontainer.json +++ b/examples/multi-devcontainer/.devcontainer.json @@ -1 +1 @@ -{ "image": "mcr.microsoft.com/devcontainers/base:ubuntu", "build": {} } +{ "image": "ghcr.io/devsy-org/test-images/base:ubuntu", "build": {} } diff --git a/examples/multi-devcontainer/proj1/.devcontainer.json b/examples/multi-devcontainer/proj1/.devcontainer.json index caeb2d094..87cdf8308 100644 --- a/examples/multi-devcontainer/proj1/.devcontainer.json +++ b/examples/multi-devcontainer/proj1/.devcontainer.json @@ -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" } diff --git a/examples/multi-devcontainer/proj2/.devcontainer.json b/examples/multi-devcontainer/proj2/.devcontainer.json index 5ade79a44..25e8ab286 100644 --- a/examples/multi-devcontainer/proj2/.devcontainer.json +++ b/examples/multi-devcontainer/proj2/.devcontainer.json @@ -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" } diff --git a/examples/object-lifecycle-hooks/.devcontainer.json b/examples/object-lifecycle-hooks/.devcontainer.json index 265230662..665679fd0 100644 --- a/examples/object-lifecycle-hooks/.devcontainer.json +++ b/examples/object-lifecycle-hooks/.devcontainer.json @@ -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", diff --git a/examples/simple/.devcontainer.json b/examples/simple/.devcontainer.json index 1cffb48db..1a0c2b7b4 100644 --- a/examples/simple/.devcontainer.json +++ b/examples/simple/.devcontainer.json @@ -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": { diff --git a/pkg/dockerfile/test_Dockerfile b/pkg/dockerfile/test_Dockerfile index 6146712e4..2951cb6bb 100644 --- a/pkg/dockerfile/test_Dockerfile +++ b/pkg/dockerfile/test_Dockerfile @@ -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 diff --git a/pkg/image/error_test.go b/pkg/image/error_test.go index 6f0d4333f..4ed423c1b 100644 --- a/pkg/image/error_test.go +++ b/pkg/image/error_test.go @@ -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)), @@ -24,7 +24,7 @@ func makeTransportErrorWithBody(statusCode int, body string) error { func TestSanitizeRegistryError_HTMLBody(t *testing.T) { htmlBody := `

403 Forbidden

` 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 {