Merge branch 'switch-to-latest-dind' into 'main'

Evan Lezar · Evan Lezar · commit bbe9742c467d · 2023-06-30T09:46:49.000Z
Switch to latest dind image for tests

See merge request nvidia/container-toolkit/container-toolkit!430
diff --git a/test/container/containerd_test.sh b/test/container/containerd_test.sh
@@ -27,7 +27,7 @@ testing::containerd::dind::setup() {
 		-v "${shared_dir}/usr/local/nvidia:/usr/local/nvidia" \
 		-v "${shared_dir}/run/docker/containerd:/run/docker/containerd" \
 		--name "${containerd_dind_ctr}" \
-		docker:stable-dind -H unix://${containerd_dind_socket}
+		docker:dind -H unix://${containerd_dind_socket}
 }
 
 testing::containerd::dind::exec() {
diff --git a/test/container/docker_test.sh b/test/container/docker_test.sh
@@ -25,7 +25,7 @@ testing::docker::dind::setup() {
 		-v "${shared_dir}/run/nvidia:/run/nvidia" \
 		-v "${shared_dir}/usr/local/nvidia:/usr/local/nvidia" \
 		--name "${docker_dind_ctr}" \
-		docker:stable-dind -H unix://${docker_dind_socket}
+		docker:dind -H unix://${docker_dind_socket}
 }
 
 testing::docker::dind::exec() {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ testing::containerd::dind::setup() {`
`27`	`27`	`-v "${shared_dir}/usr/local/nvidia:/usr/local/nvidia" \`
`28`	`28`	`-v "${shared_dir}/run/docker/containerd:/run/docker/containerd" \`
`29`	`29`	`--name "${containerd_dind_ctr}" \`
`30`		`- docker:stable-dind -H unix://${containerd_dind_socket}`
	`30`	`+ docker:dind -H unix://${containerd_dind_socket}`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`testing::containerd::dind::exec() {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ testing::docker::dind::setup() {`
`25`	`25`	`-v "${shared_dir}/run/nvidia:/run/nvidia" \`
`26`	`26`	`-v "${shared_dir}/usr/local/nvidia:/usr/local/nvidia" \`
`27`	`27`	`--name "${docker_dind_ctr}" \`
`28`		`- docker:stable-dind -H unix://${docker_dind_socket}`
	`28`	`+ docker:dind -H unix://${docker_dind_socket}`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`testing::docker::dind::exec() {`