зеркало из https://github.com/microsoft/docker.git
fix busybox image detection
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
This commit is contained in:
Родитель
b8932abcd3
Коммит
730d9ba174
|
@ -133,10 +133,10 @@ func init() {
|
||||||
|
|
||||||
func setupBaseImage() {
|
func setupBaseImage() {
|
||||||
eng := newTestEngine(log.New(os.Stderr, "", 0), false, unitTestStoreBase)
|
eng := newTestEngine(log.New(os.Stderr, "", 0), false, unitTestStoreBase)
|
||||||
job := eng.Job("inspect", unitTestImageName, "image")
|
job := eng.Job("image_inspect", unitTestImageName)
|
||||||
img, _ := job.Stdout.AddEnv()
|
img, _ := job.Stdout.AddEnv()
|
||||||
// If the unit test is not found, try to download it.
|
// If the unit test is not found, try to download it.
|
||||||
if err := job.Run(); err != nil || img.Get("id") != unitTestImageID {
|
if err := job.Run(); err != nil || img.Get("Id") != unitTestImageID {
|
||||||
// Retrieve the Image
|
// Retrieve the Image
|
||||||
job = eng.Job("pull", unitTestImageName)
|
job = eng.Job("pull", unitTestImageName)
|
||||||
job.Stdout.Add(utils.NopWriteCloser(os.Stdout))
|
job.Stdout.Add(utils.NopWriteCloser(os.Stdout))
|
||||||
|
|
Загрузка…
Ссылка в новой задаче