Merge pull request #46 from theartoflogic/master

[FIXED JENKINS-32792] Added check for "sha256:" prefix in image ID
jenkinsci · Feb 8, 2016 · e53ebf8 · e53ebf8
2 parents 9d994fa + 8d947ca
commit e53ebf8
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/docker/commons/fingerprint/DockerFingerprints.java b/src/main/java/org/jenkinsci/plugins/docker/commons/fingerprint/DockerFingerprints.java
@@ -61,6 +61,12 @@ private DockerFingerprints() {} // no instantiation
      * @throws IllegalArgumentException Invalid ID
      */
     public static @Nonnull String getFingerprintHash(@Nonnull String id) {
+
+        // Remove the "sha256:" prefix, if it exists
+        if (id.indexOf("sha256:") == 0) {
+            id = id.substring(7);
+        }
+
         if (id.length() != 64) {
             throw new IllegalArgumentException("Expecting 64-char full image ID, but got " + id);
         }