[ARVADOS] updated: 1.1.3-181-gd6433ab

[Git user]

Summary of changes:
 services/crunch-run/crunchrun.go | 3 +++
 1 file changed, 3 insertions(+)

       via  d6433abcf8b95012fee8a18a82edc88921d7544e (commit)
      from  cc14a0ddb50d0d9b3aa03295e4212bd13b073be1 (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 d6433abcf8b95012fee8a18a82edc88921d7544e
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Tue Mar 13 11:37:03 2018 -0400

    13134: Check for conflicts between secret mounts and regular mounts
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index 4d231a4..53815cb 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -399,6 +399,9 @@ func (runner *ContainerRunner) SetupMounts() (err error) {
 		binds = append(binds, bind)
 	}
 	for bind := range runner.SecretMounts {
+		if _, ok := runner.Container.Mounts[bind]; ok {
+			return fmt.Errorf("Secret mount %q conflicts with regular mount", bind)
+		}
 		if runner.SecretMounts[bind].Kind != "json" &&
 			runner.SecretMounts[bind].Kind != "text" {
 			return fmt.Errorf("Secret mount %q type is %q but only 'json' and 'text' are permitted.",

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


hooks/post-receive
--