integ-cli: fix test requiring scratch

[ahmetb]

TestRunCidFileCleanupIfEmpty fails on windows/mac because the test runs
the command docker run scratch and it gives the following error:

Unable to find image 'scratch:latest' locally
Pulling repository scratch
511136ea3c5a: Download complete
FATA[0004] 'scratch' is a reserved name

I am not entirely sure if this is a test issue or not but I had a quick
workaround by creating another image using FROM scratch and using that.

Signed-off-by: Ahmet Alp Balkan ahmetalpbalkan@gmail.com
cc: @LK4D4 @duglin @cpuguy83

[duglin]

just wondering, does using 'busybox' instead work?

[cpuguy83]

Yeah, scratch is no longer a real image anymore and can't be used to create a container. It is however a reserved name for Dockerfiles. Busybox should also "just work" here.

[duglin]

@ahmetalpbalkan can you please fix this test? But not for the reason you state :-)
First, can you fix it so that it checks to make sure the 'run' fails for the right reason. I suspect its failing now because of "scratch" and not for the missing cmd. We need to check the error msg.

Then once the test fails, for the right reason, and on all platforms not just windows, we can then s/scratch/busybox/.

[ahmetb]

@duglin @cpuguy83 in this case busybox is not the solution, because you can docker run busybox and it does not give the Error response from daemon: No command specified error.

I will add the string.contains("No command specified") check but I think since scratch still seems like a valid name in FROM directive and successfully gives an image that we can't run like docker run img, I will keep that part. wdyt?

[tiborvass]

@ahmetalpbalkan there is an image called emptyfs that replaces scratch right before the daemon is started, let's use that instead.

[cpuguy83]

Oh, maybe I didn't understand the test, I see the comment just above the func declaration in the full view now :)
Yes, that makes sense.

[ahmetb]

fixed with emptyfs and err message check @tiborvass @cpuguy83

[tiborvass]

LGTM

[duglin]

much better. LGTM

[tianon]

LGTM