tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename --no-links to --only 

Signed-off-by: d11wtq <chris@w3style.co.uk>
This commit is contained in:
d11wtq 2014-06-11 10:41:24 +00:00
parent e71e82f8ac
commit 6e485df084
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/cli.md
View File

@ -53,9 +53,9 @@ Links are also created between one-off commands and the other containers for tha
$ fig run db /bin/sh -c "psql -h \$DB_1_PORT_5432_TCP_ADDR -U docker" $ fig run db /bin/sh -c "psql -h \$DB_1_PORT_5432_TCP_ADDR -U docker"
If you do not want linked containers to be started when running the one-off command, specify the `--no-links` flag: If you do not want linked containers to be started when running the one-off command, specify the `--only` flag:
$ fig run --no-links web python manage.py shell $ fig run --only web python manage.py shell
## scale ## scale

24
fig/cli/main.py
View File

@ -204,22 +204,22 @@ class TopLevelCommand(Command):
By default, linked services will be started, unless they are already By default, linked services will be started, unless they are already
running. If you do not want to start linked services, use running. If you do not want to start linked services, use
`fig run --no-links SERVICE COMMAND [ARGS...]`. `fig run --only SERVICE COMMAND [ARGS...]`.
Usage: run [options] SERVICE COMMAND [ARGS...] Usage: run [options] SERVICE COMMAND [ARGS...]
Options: Options:
-d Detached mode: Run container in the background, print -d Detached mode: Run container in the background, print new
new container name. container name.
-T Disable pseudo-tty allocation. By default `fig run` -T Disable pseudo-tty allocation. By default `fig run`
allocates a TTY. allocates a TTY.
--rm Remove container after run. Ignored in detached mode. --rm Remove container after run. Ignored in detached mode.
--no-links Don't start linked services. --only Don't start linked services.
""" """
service = self.project.get_service(options['SERVICE']) service = self.project.get_service(options['SERVICE'])
if not options['--no-links']: if not options['--only']:
self.project.up( self.project.up(
service_names=service.get_linked_names(), service_names=service.get_linked_names(),
start_links=True, start_links=True,
@ -309,14 +309,14 @@ class TopLevelCommand(Command):
Usage: up [options] [SERVICE...] Usage: up [options] [SERVICE...]
Options: Options:
-d Detached mode: Run containers in the background, -d Detached mode: Run containers in the background,
print new container names. print new container names.
--no-links Don't start linked services. --only Don't start linked services.
--no-recreate If containers already exist, don't recreate them. --no-recreate If containers already exist, don't recreate them.
""" """
detached = options['-d'] detached = options['-d']
start_links = not options['--no-links'] start_links = not options['--only']
recreate = not options['--no-recreate'] recreate = not options['--no-recreate']
service_names = options['SERVICE'] service_names = options['SERVICE']

4
tests/integration/cli_test.py
View File

@ -65,7 +65,7 @@ class CLITestCase(DockerClientTestCase):
def test_up_with_no_links(self): def test_up_with_no_links(self):
self.command.base_dir = 'tests/fixtures/links-figfile' self.command.base_dir = 'tests/fixtures/links-figfile'
self.command.dispatch(['up', '-d', '--no-links', 'web'], None) self.command.dispatch(['up', '-d', '--only', 'web'], None)
web = self.command.project.get_service('web') web = self.command.project.get_service('web')
db = self.command.project.get_service('db') db = self.command.project.get_service('db')
console = self.command.project.get_service('console') console = self.command.project.get_service('console')
@ -118,7 +118,7 @@ class CLITestCase(DockerClientTestCase):
mock_stdout.fileno = lambda: 1 mock_stdout.fileno = lambda: 1
self.command.base_dir = 'tests/fixtures/links-figfile' self.command.base_dir = 'tests/fixtures/links-figfile'
self.command.dispatch(['run', '--no-links', 'web', '/bin/true'], None) self.command.dispatch(['run', '--only', 'web', '/bin/true'], None)
db = self.command.project.get_service('db') db = self.command.project.get_service('db')
self.assertEqual(len(db.containers()), 0) self.assertEqual(len(db.containers()), 0)