Skip to content
This repository has been archived by the owner on Mar 16, 2024. It is now read-only.

Commit

Permalink
Switch all nginx reference to docker/library/nginx
Browse files Browse the repository at this point in the history
Signed-off-by: Darren Shepherd <darren@acorn.io>
  • Loading branch information
ibuildthecloud committed Nov 17, 2022
1 parent 331d3f0 commit ecc0e00
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion integration/client/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,6 @@ func TestFriendlyNameInContainer(t *testing.T) {

_, img, _ := strings.Cut(image.ImageData.Containers["default"].Image, "@")
assert.Len(t, cs, 1)
assert.Equal(t, "public.ecr.aws/nginx/nginx:latest", cs[0].Spec.Image)
assert.Equal(t, "public.ecr.aws/docker/library/nginx:latest", cs[0].Spec.Image)
assert.True(t, strings.HasSuffix(cs[0].Status.ImageID, img))
}
6 changes: 3 additions & 3 deletions integration/client/testdata/dependson/Acornfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
containers: {
one: {
image: "public.ecr.aws/nginx/nginx:latest"
image: "public.ecr.aws/docker/library/nginx:latest"
ports: "80/http"
dependsOn: ["job1", "job2"]
}
two: {
image: "public.ecr.aws/nginx/nginx:latest"
image: "public.ecr.aws/docker/library/nginx:latest"
ports: "80/http"
dependsOn: "one"
}
three: {
image: "public.ecr.aws/nginx/nginx:latest"
image: "public.ecr.aws/docker/library/nginx:latest"
ports: "80/http"
dependsOn: "two"
}
Expand Down
2 changes: 1 addition & 1 deletion integration/client/testdata/nginx/Acornfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
containers: default: image: "public.ecr.aws/nginx/nginx:latest"
containers: default: image: "public.ecr.aws/docker/library/nginx:latest"
containers: default: dirs: "/usr/share/www": "vol"
2 changes: 1 addition & 1 deletion integration/client/testdata/nginx2/Acornfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
containers: nginx2: image: "public.ecr.aws/nginx/nginx:latest"
containers: nginx2: image: "public.ecr.aws/docker/library/nginx:latest"
containers: nginx2: dirs: "/usr/share/www": "vol"
2 changes: 1 addition & 1 deletion integration/run/run_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ func TestImageNameAnnotation(t *testing.T) {
}

_, digest, _ := strings.Cut(pod.Spec.Containers[0].Image, "sha256:")
return mapping["sha256:"+digest] == "public.ecr.aws/nginx/nginx:latest"
return mapping["sha256:"+digest] == "public.ecr.aws/docker/library/nginx:latest"
})
}

Expand Down
2 changes: 1 addition & 1 deletion integration/run/testdata/named/Acornfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
containers: default: image: "public.ecr.aws/nginx/nginx:latest"
containers: default: image: "public.ecr.aws/docker/library/nginx:latest"
2 changes: 1 addition & 1 deletion integration/run/testdata/params/Acornfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ containers: {
env: {
arg: "\(args.someInt)"
}
image: "public.ecr.aws/nginx/nginx:latest"
image: "public.ecr.aws/docker/library/nginx:latest"
}
}
2 changes: 1 addition & 1 deletion integration/run/testdata/simple/Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM public.ecr.aws/nginx/nginx:latest
FROM public.ecr.aws/docker/library/nginx:latest
2 changes: 1 addition & 1 deletion integration/run/testdata/volume/Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM public.ecr.aws/nginx/nginx:latest
FROM public.ecr.aws/docker/library/nginx:latest
2 changes: 1 addition & 1 deletion integration/secrets/testdata/issue-552/Acornfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
containers: {
"icinga2-master": {
image: "public.ecr.aws/nginx/nginx:latest"
image: "public.ecr.aws/docker/library/nginx:latest"
dirs: {
"/data/var": "volume://icinga-data"
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/appdefinition/appdefinition_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ containers: {
build: {}
}
right: {
image: "public.ecr.aws/nginx/nginx:latest"
image: "public.ecr.aws/docker/library/nginx:latest"
dirs: "/var/tmp": "./foo/bar"
}
}
Expand Down Expand Up @@ -201,9 +201,9 @@ images: {
assert.Equal(t, "Dockerfile", buildSpec.Containers["file"].Sidecars["left"].Build.Dockerfile)
assert.Equal(t, ".", buildSpec.Containers["file"].Sidecars["left"].Build.Context)

assert.Equal(t, "public.ecr.aws/nginx/nginx:latest", buildSpec.Containers["file"].Sidecars["right"].Image)
assert.Equal(t, "public.ecr.aws/docker/library/nginx:latest", buildSpec.Containers["file"].Sidecars["right"].Image)
assert.Equal(t, "Dockerfile", buildSpec.Containers["file"].Sidecars["right"].Build.Dockerfile)
assert.Equal(t, "public.ecr.aws/nginx/nginx:latest", buildSpec.Containers["file"].Sidecars["right"].Build.BaseImage)
assert.Equal(t, "public.ecr.aws/docker/library/nginx:latest", buildSpec.Containers["file"].Sidecars["right"].Build.BaseImage)
assert.Equal(t, ".", buildSpec.Containers["file"].Sidecars["right"].Build.Context)
assert.Equal(t, "./foo/bar", buildSpec.Containers["file"].Sidecars["right"].Build.ContextDirs["/var/tmp"])

Expand Down
2 changes: 1 addition & 1 deletion pkg/appdefinition/params_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ profiles: {
containers: {
web: {
image: "public.ecr.aws/nginx/nginx:latest"
image: "public.ecr.aws/docker/library/nginx:latest"
scale: args.replicas
}
}`)
Expand Down
2 changes: 1 addition & 1 deletion pkg/appdefinition/std_test.cue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
containers: default: {
image: "public.ecr.aws/nginx/nginx:latest"
image: "public.ecr.aws/docker/library/nginx:latest"
files: "a": std.toYAML(localData)
}

Expand Down

0 comments on commit ecc0e00

Please sign in to comment.