Skip to content

Commit

Permalink
[JENKINS-32792] Fix error whith fingerprints when parent image is not…
Browse files Browse the repository at this point in the history
… set

Expecting 64-char full image ID, but got
  • Loading branch information
carlossg committed Mar 9, 2016
1 parent 0cbb39f commit 2b42838
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -50,7 +50,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>docker-commons</artifactId>
<version>1.0</version>
<version>1.3.1</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/cloudbees/dockerpublish/DockerBuilder.java
Expand Up @@ -482,12 +482,14 @@ void processFingerprints(@Nonnull String image) throws IOException, InterruptedE
return; // Bad result, cannot do anything
}
final InspectImageResponse rsp = DockerCLIHelper.parseInspectImageResponse(response.stdout);
logger.log(Level.FINEST, "Inspect image {0}: {1}", new Object[] { image, response.stdout });
if (rsp == null) {
return; // Cannot process the data
}

// Create or retrieve the fingerprint
DockerFingerprints.addFromFacet(rsp.getParent(), rsp.getId(), build);
// parent can be ""
DockerFingerprints.addFromFacet(Util.fixEmpty(rsp.getParent()), rsp.getId(), build);

}

Expand Down

0 comments on commit 2b42838

Please sign in to comment.