Make fig run COMMAND parameter optional.
This behaves more like the native docker client, where the absence of a command means docker runs the CMD in the Dockerfile. If a command is defined in fig.yml this is used instead. Signed-off-by: Chris Corbyn <chris@w3style.co.uk>
This commit is contained in:
parent
dd5c2e8767
commit
ef2fb77c1d
3 changed files with 39 additions and 9 deletions
|
|
@ -206,7 +206,7 @@ class TopLevelCommand(Command):
|
|||
running. If you do not want to start linked services, use
|
||||
`fig run --no-deps SERVICE COMMAND [ARGS...]`.
|
||||
|
||||
Usage: run [options] SERVICE COMMAND [ARGS...]
|
||||
Usage: run [options] SERVICE [COMMAND] [ARGS...]
|
||||
|
||||
Options:
|
||||
-d Detached mode: Run container in the background, print
|
||||
|
|
@ -233,8 +233,13 @@ class TopLevelCommand(Command):
|
|||
if options['-d'] or options['-T'] or not sys.stdin.isatty():
|
||||
tty = False
|
||||
|
||||
if options['COMMAND']:
|
||||
command = [options['COMMAND']] + options['ARGS']
|
||||
else:
|
||||
command = service.options.get('command')
|
||||
|
||||
container_options = {
|
||||
'command': [options['COMMAND']] + options['ARGS'],
|
||||
'command': command,
|
||||
'tty': tty,
|
||||
'stdin_open': not options['-d'],
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue