Skip to content

Commit 6f94b15

Browse files
estespestesp
authored
Merge pull request #5189 from TBBle/reduce-load-on-ratelimited-docker.io
Reduce load on ratelimited docker.io
2 parents 42266da + 5cfc4a8 commit 6f94b15

5 files changed

Lines changed: 22 additions & 285 deletions

File tree

‎integration/client/client_test.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ func TestImagePullAllPlatforms(t *testing.T) {
310310
defer cancel()
311311

312312
cs := client.ContentStore()
313-
img, err := client.Fetch(ctx, "docker.io/library/busybox:latest")
313+
img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.4.1")
314314
if err != nil {
315315
t.Fatal(err)
316316
}
@@ -358,7 +358,9 @@ func TestImagePullSomePlatforms(t *testing.T) {
358358
opts = append(opts, WithPlatform(platform))
359359
}
360360

361-
img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.4.1", opts...)
361+
// Note: Must be different to the image used in TestImagePullAllPlatforms
362+
// or it will see the content pulled by that, and fail.
363+
img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.2", opts...)
362364
if err != nil {
363365
t.Fatal(err)
364366
}

‎integration/client/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/containerd/containerd/integration/client
33
go 1.15
44

55
require (
6-
github.com/Microsoft/hcsshim v0.8.14
6+
github.com/Microsoft/hcsshim v0.8.15
77
github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3
88
github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68
99
github.com/containerd/containerd v1.5.0-beta.1

0 commit comments

Comments
 (0)