Merge pull request #285 from Yelp/remove-port-hacks

Set MARATHON_PORT env variable in local-run
Yelp · Mar 3, 2016 · d3f70c4 · d3f70c4
2 parents 4eda5f0 + 30c190d
commit d3f70c4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/paasta_tools/cli/cmds/local_run.py b/paasta_tools/cli/cmds/local_run.py
@@ -371,6 +371,7 @@ def get_docker_run_cmd(memory, random_port, container_name, volumes, env, intera
     cmd = ['docker', 'run']
     for k, v in env.iteritems():
         cmd.append('--env=\"%s=%s\"' % (k, v))
+    cmd.append('--env=MARATHON_PORT=%s' % random_port)
     cmd.append('--env=HOST=%s' % hostname)
     cmd.append('--env=MESOS_SANDBOX=/mnt/mesos/sandbox')
     cmd.append('--memory=%dm' % memory)

diff --git a/tests/cli/test_cmds_local_run.py b/tests/cli/test_cmds_local_run.py
@@ -444,6 +444,7 @@ def test_get_docker_run_cmd_interactive_false():
     actual = get_docker_run_cmd(memory, random_port, container_name, volumes,
                                 env, interactive, docker_hash, command, hostname)
 
+    assert any(['--env=MARATHON_PORT=%s' % random_port in arg for arg in actual])
     assert '--memory=%dm' % memory in actual
     assert any(['--publish=%s' % random_port in arg for arg in actual])
     assert '--name=%s' % container_name in actual