#323 Fix for missed TINY_IMAGE during DockerClient initialization#324
#323 Fix for missed TINY_IMAGE during DockerClient initialization#324bsideup merged 2 commits intotestcontainers:masterfrom
Conversation
…of DinD environment
| if (images.stream().noneMatch(it -> it.getRepoTags() != null && asList(it.getRepoTags()).contains(TINY_IMAGE))) { | ||
| client.pullImageCmd(TINY_IMAGE).exec(new PullImageResultCallback()).awaitSuccess(); | ||
| } | ||
| checkAndPullImage(client, TINY_IMAGE); |
There was a problem hiding this comment.
checkDiskSpaceAndHandleExceptions calls checkDiskSpace which calls runInsideDocker which calls checkAndPullImage after your change.
It means that we could remove checkAndPullImage from here and inline checkAndPullImage in runInsideDocker.
WDYT?
There was a problem hiding this comment.
I removed that call, but kept the method checkAndPullImage. I don't like long methods, so i would keep the separate method, if you don't mind :)
| private static final String SUCCESS = "SUCCESS"; | ||
|
|
||
| @Test | ||
| public void runCommandInsideDockerShouldPullImageIfItDoesNotExistsLocally() { |
There was a problem hiding this comment.
I think this test does too much. What it should test that runInsideDocker does not fail if image wasn't pulled yet
There was a problem hiding this comment.
You are right, I kept here only runInsideDocker method call
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| /** | ||
| * Created mgorelikov on 05/04/2017 |
There was a problem hiding this comment.
auto-generated doc comment. I would remove it, doesn't help here.
However, you can include yourself in contributors list :)
There was a problem hiding this comment.
Fixed. Sorry for that
|
@gorelikov merged, thanks for your contribution! :) |
|
Hi there. It's crucial PR for our CI because we still cannot test and build up services with Jenkins. I'm afraid it's to long to wait for 1.3.0 release. So I'd be glad if it would be rescheduled to 1.2.1, for example :) |
|
You could always fallback to using a Jitpack dependency on the merged PR: |
4 participants
Fix for
No such image: alpine:3.5 #323@bsideup