Permalink
Browse files

Fix crash caused by incorrectly appended volume strings

Docker volumes are supposed to be a list in the form of
[ '<path>:<bind>', '<path>:<bind>' ]

Current parsing code parses this correctly but zeros out self.volumes
and initializes it again in the form of [ '<path>', '<path>', '<path' ]

This breaks the parser if volumes is parsed again as it is expecting
 <path>:<bind> (a specific example is rebuild)
  • Loading branch information...
anish committed Mar 24, 2016
1 parent 738588c commit 369da646cf91d7c029e7abc7524489e25f1f343e
Showing with 1 addition and 1 deletion.
  1. +1 −1 master/buildbot/worker/docker.py
@@ -80,7 +80,7 @@ def __init__(self, name, password, docker_host, image=None, command=None,
config.error("Invalid volume definition for docker "
"%s. Skipping..." % volume_string)
continue
self.volumes.append(volume)
self.volumes.append(volume_string)
ro = False
if bind.endswith(':ro') or bind.endswith(':rw'):

0 comments on commit 369da64

Please sign in to comment.