x
/
dox
Code Issues Proposed changes

Merge "Add option to keep test container"

This commit is contained in:
Jenkins 2014-10-03 18:48:50 +00:00 committed by Gerrit Code Review
parent 91d578466a be61a19eff
commit 3091e11959
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dox/cmd.py
View File

@ -70,6 +70,9 @@ def parse_args():
help='User to run the container to '
'format is user:uid:gid, with boot2docker use '
'docker:1000:10 (default to your current user)')
parser.add_argument('-k', '--keep', dest='keep_image', default=False,
action='store_true',
help="Keep test container after command finishes")
return parser.parse_args()

15
dox/runner.py
View File

@ -155,11 +155,16 @@ class Runner(object):
shutil.rmtree(tempd)
def run_commands(self, command):
self._docker_run(
'--privileged=true',
'--rm', '--user=%s' % self.user_map['username'],
'-v', "%s:/src" % os.path.abspath('.'),
'-w', '/src', self.test_image_name, *command)
docker_args = ['--privileged=true',
'--user=%s' % self.user_map['username'],
'-v', "%s:/src" % os.path.abspath('.'),
'-w', '/src',
self.test_image_name]
if not self.args.keep_image:
docker_args.append('--rm')
for c in command:
docker_args.append(c)
self._docker_run(*docker_args)
def have_base_image(self):
if self.args.rebuild_all: