Skip to content

fix(e2e): replace external devcontainer image with own registry test container #223

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 1 commit into from
May 5, 2026
Merged

fix(e2e): replace external devcontainer image with own registry test container #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions e2e/tests/extends/extends.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ var _ = ginkgo.Describe("extends property", ginkgo.Label("extends"), func() {
config := parseConfigFromOutput(stdout)
gomega.Expect(config).To(gomega.HaveKeyWithValue("name", "Single Level Child"))
gomega.Expect(config).To(
gomega.HaveKeyWithValue("image", "mcr.microsoft.com/devcontainers/base:ubuntu"),
gomega.HaveKeyWithValue("image", "ghcr.io/devsy-org/test-images/base:ubuntu"),
)
gomega.Expect(config).To(gomega.HaveKeyWithValue("remoteUser", "vscode"))
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
Expand Down Expand Up @@ -92,7 +92,7 @@ var _ = ginkgo.Describe("extends property", ginkgo.Label("extends"), func() {
config := parseConfigFromOutput(stdout)
gomega.Expect(config).To(gomega.HaveKeyWithValue("name", "Array Replace Child"))
gomega.Expect(config).To(
gomega.HaveKeyWithValue("image", "mcr.microsoft.com/devcontainers/base:ubuntu"),
gomega.HaveKeyWithValue("image", "ghcr.io/devsy-org/test-images/base:ubuntu"),
)

forwardPorts, ok := config["forwardPorts"].([]any)
Expand Down Expand Up @@ -120,7 +120,7 @@ var _ = ginkgo.Describe("extends property", ginkgo.Label("extends"), func() {
config := parseConfigFromOutput(stdout)
gomega.Expect(config).To(gomega.HaveKeyWithValue("name", "Multi Level Child"))
gomega.Expect(config).To(
gomega.HaveKeyWithValue("image", "mcr.microsoft.com/devcontainers/base:ubuntu"),
gomega.HaveKeyWithValue("image", "ghcr.io/devsy-org/test-images/base:ubuntu"),
)
gomega.Expect(config).To(gomega.HaveKeyWithValue("remoteUser", "vscode"))

Expand Down Expand Up @@ -157,7 +157,7 @@ var _ = ginkgo.Describe("extends property", ginkgo.Label("extends"), func() {
config := parseConfigFromOutput(stdout)
gomega.Expect(config).To(gomega.HaveKeyWithValue("name", "Array Extends Child"))
gomega.Expect(config).To(
gomega.HaveKeyWithValue("image", "mcr.microsoft.com/devcontainers/base:ubuntu"),
gomega.HaveKeyWithValue("image", "ghcr.io/devsy-org/test-images/base:ubuntu"),
)
gomega.Expect(config).To(gomega.HaveKeyWithValue("remoteUser", "vscode"))

Expand Down Expand Up @@ -242,7 +242,7 @@ var _ = ginkgo.Describe("extends property", ginkgo.Label("extends"), func() {
regHost := strings.TrimPrefix(srv.URL, "http://")

parentJSON := `{
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
"image": "ghcr.io/devsy-org/test-images/base:ubuntu",
"containerEnv": {"PARENT_KEY": "parent-value", "SHARED": "from-parent"},
"features": {"ghcr.io/devcontainers/features/node:1": {}}
}`
Expand Down Expand Up @@ -277,7 +277,7 @@ var _ = ginkgo.Describe("extends property", ginkgo.Label("extends"), func() {
gomega.Expect(config).To(
gomega.HaveKeyWithValue(
"image",
"mcr.microsoft.com/devcontainers/base:ubuntu",
"ghcr.io/devsy-org/test-images/base:ubuntu",
),
)

Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/extends/testdata/array-extends/.devcontainer/base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
"image": "ghcr.io/devsy-org/test-images/base:ubuntu",
"containerEnv": {
"FROM_BASE": "base-value",
"SHARED": "from-base"
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/extends/testdata/array-replace/.devcontainer/base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
"image": "ghcr.io/devsy-org/test-images/base:ubuntu",
"forwardPorts": [3000, 4000],
"capAdd": ["SYS_PTRACE"]
}
2 changes: 1 addition & 1 deletion e2e/tests/extends/testdata/deep-merge/.devcontainer/base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
"image": "ghcr.io/devsy-org/test-images/base:ubuntu",
"containerEnv": {
"SHARED_KEY": "from-base",
"BASE_ONLY": "base-value"
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/extends/testdata/multi-level/.devcontainer/grandparent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
"image": "ghcr.io/devsy-org/test-images/base:ubuntu",
"remoteUser": "vscode",
"containerEnv": {
"LEVEL": "grandparent",
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/extends/testdata/single-level/.devcontainer/base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
"image": "ghcr.io/devsy-org/test-images/base:ubuntu",
"remoteUser": "vscode",
"containerEnv": {
"BASE_VAR": "from-base"
Expand Down
6 changes: 3 additions & 3 deletions e2e/tests/readconfiguration/readconfiguration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ var _ = ginkgo.Describe("read-configuration command", ginkgo.Label("read-configu
gomega.Expect(ok).To(gomega.BeTrue(), "configuration should be an object")
gomega.Expect(config).To(gomega.HaveKeyWithValue("name", "Test Read Configuration"))
gomega.Expect(config).To(
gomega.HaveKeyWithValue("image", "mcr.microsoft.com/devcontainers/base:ubuntu"),
gomega.HaveKeyWithValue("image", "ghcr.io/devsy-org/test-images/base:ubuntu"),
)
gomega.Expect(config).To(gomega.HaveKey("features"))
gomega.Expect(config).To(
Expand Down Expand Up @@ -117,7 +117,7 @@ var _ = ginkgo.Describe("read-configuration command", ginkgo.Label("read-configu
gomega.HaveKeyWithValue("remoteUser", "vscode"),
)
gomega.Expect(merged).To(
gomega.HaveKeyWithValue("image", "mcr.microsoft.com/devcontainers/base:ubuntu"),
gomega.HaveKeyWithValue("image", "ghcr.io/devsy-org/test-images/base:ubuntu"),
)
}, ginkgo.SpecTimeout(framework.TimeoutShort()))

Expand Down Expand Up @@ -313,7 +313,7 @@ var _ = ginkgo.Describe("read-configuration command", ginkgo.Label("read-configu
metadataLabel := `[{"remoteUser":"testuser","customizations":{"vscode":{"extensions":["ms-python.python"]}}}]`
out, err := exec.CommandContext(ctx, "docker", "run", "-d",
"--label", "devcontainer.metadata="+metadataLabel,
"mcr.microsoft.com/devcontainers/base:ubuntu",
"ghcr.io/devsy-org/test-images/base:ubuntu",
"sleep", "infinity",
).Output()
framework.ExpectNoError(err)
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/readconfiguration/testdata-container-env/.devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
"image": "ghcr.io/devsy-org/test-images/base:ubuntu",
"containerEnv": {
"TEST_META_VAR": "meta-test-value",
"ANOTHER_VAR": "another-value"
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/readconfiguration/testdata-host-requirements/.devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Host Requirements Test",
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
"image": "ghcr.io/devsy-org/test-images/base:ubuntu",
"hostRequirements": {
"cpus": 4,
"memory": "8gb",
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/readconfiguration/testdata-port-attributes/.devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Port Attributes Test",
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
"image": "ghcr.io/devsy-org/test-images/base:ubuntu",
"forwardPorts": [8080, 9090],
"portsAttributes": {
"8080": {
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/readconfiguration/testdata-port-range/.devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "Port Range Test",
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
"image": "ghcr.io/devsy-org/test-images/base:ubuntu",
"forwardPorts": [8080, "3000-3005"]
}
2 changes: 1 addition & 1 deletion e2e/tests/readconfiguration/testdata/.devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Test Read Configuration",
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
"image": "ghcr.io/devsy-org/test-images/base:ubuntu",
"features": {
"ghcr.io/devcontainers/features/node:1": {
"version": "18"
Expand Down
Loading