From 6e73fb38ea55ec6280c3ca5478f879770ab9907b Mon Sep 17 00:00:00 2001
From: Alf Lervag <alf.lervag@bouvet.no>
Date: Tue, 22 Dec 2015 11:43:48 +0100
Subject: [PATCH 1/2] Fixes #2448

Signed-off-by: Alf Lervag <alf.lervag@bouvet.no>

Conflicts:
	compose/cli/main.py
	requirements.txt
---
 compose/cli/main.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/compose/cli/main.py b/compose/cli/main.py
index 7409107df..14febe254 100644
--- a/compose/cli/main.py
+++ b/compose/cli/main.py
@@ -709,7 +709,12 @@ def run_one_off_container(container_options, project, service, options):
     signals.set_signal_handler_to_shutdown()
     try:
         try:
-            pty = PseudoTerminal(project.client, container.id, interactive=not options['-T'])
+            pty = PseudoTerminal(
+                project.client,
+                container.id,
+                interactive=not options['-T'],
+                logs=False,
+            )
             sockets = pty.sockets()
             service.start_container(container)
             pty.start(sockets)

From da2b6329ae0f1b3c42055b4a25b9fbe03cc1a560 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Thu, 21 Jan 2016 19:15:15 +0000
Subject: [PATCH 2/2] Add test for logs=False

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Conflicts:
	compose/cli/main.py
---
 tests/unit/cli_test.py | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
index f9e3fb8f7..fd52a3c1e 100644
--- a/tests/unit/cli_test.py
+++ b/tests/unit/cli_test.py
@@ -71,6 +71,37 @@ class CLITestCase(unittest.TestCase):
         with self.assertRaises(NoSuchCommand):
             TopLevelCommand().dispatch(['help', 'nonexistent'], None)
 
+    @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason="requires dockerpty")
+    @mock.patch('compose.cli.main.PseudoTerminal', autospec=True)
+    def test_run_interactive_passes_logs_false(self, mock_pseudo_terminal):
+        command = TopLevelCommand()
+        mock_client = mock.create_autospec(docker.Client)
+        mock_project = mock.Mock(client=mock_client)
+        mock_project.get_service.return_value = Service(
+            'service',
+            client=mock_client,
+            environment=['FOO=ONE', 'BAR=TWO'],
+            image='someimage')
+
+        with pytest.raises(SystemExit):
+            command.run(mock_project, {
+                'SERVICE': 'service',
+                'COMMAND': None,
+                '-e': ['BAR=NEW', 'OTHER=bär'.encode('utf-8')],
+                '--user': None,
+                '--no-deps': None,
+                '-d': False,
+                '-T': None,
+                '--entrypoint': None,
+                '--service-ports': None,
+                '--publish': [],
+                '--rm': None,
+                '--name': None,
+            })
+
+        _, _, call_kwargs = mock_pseudo_terminal.mock_calls[0]
+        assert call_kwargs['logs'] is False
+
     @pytest.mark.xfail(IS_WINDOWS_PLATFORM, reason="requires dockerpty")
     @mock.patch('compose.cli.main.PseudoTerminal', autospec=True)
     def test_run_with_environment_merged_with_options_list(self, mock_pseudo_terminal):