mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 00:14:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

remove debug print, add --rm option and use -e docker param

Browse source
This commit is contained in:
Guillaume Leclerc 2016-05-15 14:57:00 +02:00
parent 5af47b2baf
commit 0867dd6dfc
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
docker.py → xonsh-in-docker.py
View file

@ -12,7 +12,8 @@ parser = argparse.ArgumentParser(description=program_description)
parser.add_argument('env', nargs='*', default=[], metavar='ENV=value')
parser.add_argument('--python', '-p', default='3.4', metavar='python_version')
parser.add_argument('--ptk', '-t', default='1.00', metavar='ptk_version')
parser.add_argument('--command', '-c', default='/usr/bin/env xonsh',
parser.add_argument('--rm', action='store_true')
parser.add_argument('--command', '-c', default='xonsh',
metavar='command')
args = parser.parse_args()
@ -25,18 +26,11 @@ RUN pip install --upgrade pip && pip install \\
pygments
RUN mkdir /xonsh
WORKDIR /xonsh
CMD {command}
ENV {env}
ADD ./ ./
RUN python setup.py install
""".format(
python_version = args.python,
ptk_version = args.ptk,
command = args.command,
env = ' '.join(args.env))
print(docker_script)
ptk_version = args.ptk)
print('Building and running Xonsh')
print('Using python ', args.python)
@ -45,7 +39,16 @@ print('Using prompt-toolkit ', args.ptk)
with open('./Dockerfile', 'w+') as f:
f.write(docker_script)
env_string = ' '.join(args.env)
subprocess.call(['docker', 'build', '-t' , 'xonsh', '.'])
os.remove('./Dockerfile')
subprocess.call(['docker', 'run', '-ti' , 'xonsh'])
run_args = ['docker', 'run', '-ti']
print(args.env)
for e in args.env:
run_args += ['-e', e]
if args.rm:
run_args.append('--rm')
run_args += ['xonsh', args.command]
subprocess.call(run_args)