[ARVADOS] updated: 91dc5f1d7f5ad9eb2640f6089e2d0476cbf87c8e

Git user git at public.curoverse.com
Fri Oct 21 01:37:49 EDT 2016


Summary of changes:
 sdk/cli/bin/crunch-job | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  91dc5f1d7f5ad9eb2640f6089e2d0476cbf87c8e (commit)
       via  1f208cec34df32a83683110b552a1f62767a4852 (commit)
      from  68387de8c5b5c5950f2e10d315172658297835b9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 91dc5f1d7f5ad9eb2640f6089e2d0476cbf87c8e
Merge: 68387de 1f208ce
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Oct 21 01:18:54 2016 -0400

    Merge branch 'crunch-job_finds_newer_docker_hashes' of https://github.com/tmooney/arvados
    
    No issue #


commit 1f208cec34df32a83683110b552a1f62767a4852
Author: Thomas Mooney <tmooney at genome.wustl.edu>
Date:   Wed Oct 19 17:59:52 2016 -0500

    Support Docker v1.10+ hashes that include sha256: prefix.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 39238b0..cdb5729 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -2066,7 +2066,7 @@ sub find_docker_image {
       }
     }
   }
-  if (defined($filename) and ($filename =~ /^([0-9A-Fa-f]{64})\.tar$/)) {
+  if (defined($filename) and ($filename =~ /^((?:sha256:)?[0-9A-Fa-f]{64})\.tar$/)) {
     return ($streamname, $1);
   } else {
     return (undef, undef);

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list