Merge "--rm needs to be after the image or it would fail"

This commit is contained in:
Jenkins 2014-10-08 21:17:29 +00:00 committed by Gerrit Code Review
commit 6d4ae348d8
1 changed files with 2 additions and 2 deletions

View File

@ -158,10 +158,10 @@ class Runner(object):
docker_args = ['--privileged=true',
'--user=%s' % self.user_map['username'],
'-v', "%s:/src" % os.path.abspath('.'),
'-w', '/src',
self.test_image_name]
'-w', '/src']
if not self.args.keep_image:
docker_args.append('--rm')
docker_args.append(self.test_image_name)
for c in command:
docker_args.append(c)
self._docker_run(*docker_args)