Merge pull request #9884 from brendandburns/gcr

Switch to loading busybox from gcr.
This commit is contained in:
Saad Ali
2015-06-17 11:38:24 -07:00
3 changed files with 4 additions and 4 deletions

View File

@@ -172,7 +172,7 @@ func makeCheckPod(ns string, nfsserver string) *api.Pod {
Containers: []api.Container{
{
Name: "scrub-checker",
Image: "busybox",
Image: "gcr.io/google_containers/busybox",
Command: []string{"/bin/sh"},
Args: []string{"-c", "test ! -e /mnt/index.html || exit 1"},
VolumeMounts: []api.VolumeMount{

View File

@@ -76,7 +76,7 @@ func testPreStop(c *client.Client, ns string) {
Containers: []api.Container{
{
Name: "tester",
Image: "busybox",
Image: "gcr.io/google_containers/busybox",
Command: []string{"sleep", "600"},
Lifecycle: &api.Lifecycle{
PreStop: &api.Handler{