Merge branch 'master' of github.com:docker/docker-py

Author: shin-

docker/auth/auth.py

@@ -92,7 +92,7 @@ def decode_auth(auth):
     if isinstance(auth, six.string_types):
         auth = auth.encode('ascii')
     s = base64.b64decode(auth)
-    login, pwd = s.split(b':')
+    login, pwd = s.split(b':', 1)
     return login.decode('ascii'), pwd.decode('ascii')
 
 

docker/client.py

@@ -299,6 +299,12 @@ def build(self, path=None, tag=None, quiet=False, fileobj=None,
             if os.path.exists(dockerignore):
                 with open(dockerignore, 'r') as f:
                     exclude = list(filter(bool, f.read().split('\n')))
+                    # These are handled by the docker daemon and should not be
+                    # excluded on the client
+                    if 'Dockerfile' in exclude:
+                        exclude.remove('Dockerfile')
+                    if '.dockerignore' in exclude:
+                        exclude.remove(".dockerignore")
             context = utils.tar(path, exclude=exclude)
 
         if utils.compare_version('1.8', self._version) >= 0:

tests/integration_test.py

@@ -32,6 +32,7 @@
 # export; history; import_image; insert; port; push; tag; get; load; stats;
 
 DEFAULT_BASE_URL = os.environ.get('DOCKER_HOST')
+EXEC_DRIVER_IS_NATIVE = True
 
 warnings.simplefilter('error')
 create_host_config = docker.utils.create_host_config
@@ -312,6 +313,7 @@ def runTest(self):
         self.assertFalse(inspect_data['VolumesRW'][mount_dest])
 
 
+@unittest.skipIf(not EXEC_DRIVER_IS_NATIVE, 'Exec driver not native')
 class TestCreateContainerReadOnlyFs(BaseTestCase):
     def runTest(self):
         ctnr = self.client.create_container(
@@ -325,6 +327,7 @@ def runTest(self):
         self.assertNotEqual(res, 0)
 
 
+@unittest.skipIf(not EXEC_DRIVER_IS_NATIVE, 'Exec driver not native')
 class TestStartContainerReadOnlyFs(BaseTestCase):
     def runTest(self):
         # Presumably a bug in 1.5.0
@@ -351,14 +354,18 @@ def runTest(self):
 
 class TestRenameContainer(BaseTestCase):
     def runTest(self):
+        version = self.client.version()['Version']
         name = 'hong_meiling'
         res = self.client.create_container('busybox', 'true')
         self.assertIn('Id', res)
         self.tmp_containers.append(res['Id'])
         self.client.rename(res, name)
         inspect = self.client.inspect_container(res['Id'])
         self.assertIn('Name', inspect)
-        self.assertEqual(name, inspect['Name'])
+        if version == '1.5.0':
+            self.assertEqual(name, inspect['Name'])
+        else:
+            self.assertEqual('/{0}'.format(name), inspect['Name'])
 
 
 class TestStartContainer(BaseTestCase):
@@ -581,7 +588,8 @@ def runTest(self):
         self.assertIn('State', container_info)
         state = container_info['State']
         self.assertIn('ExitCode', state)
-        self.assertNotEqual(state['ExitCode'], 0)
+        if EXEC_DRIVER_IS_NATIVE:
+            self.assertNotEqual(state['ExitCode'], 0)
         self.assertIn('Running', state)
         self.assertEqual(state['Running'], False)
 
@@ -598,7 +606,8 @@ def runTest(self):
         self.assertIn('State', container_info)
         state = container_info['State']
         self.assertIn('ExitCode', state)
-        self.assertNotEqual(state['ExitCode'], 0)
+        if EXEC_DRIVER_IS_NATIVE:
+            self.assertNotEqual(state['ExitCode'], 0)
         self.assertIn('Running', state)
         self.assertEqual(state['Running'], False)
 
@@ -614,7 +623,8 @@ def runTest(self):
         self.assertIn('State', container_info)
         state = container_info['State']
         self.assertIn('ExitCode', state)
-        self.assertNotEqual(state['ExitCode'], 0)
+        if EXEC_DRIVER_IS_NATIVE:
+            self.assertNotEqual(state['ExitCode'], 0)
         self.assertIn('Running', state)
         self.assertEqual(state['Running'], False)
 
@@ -630,7 +640,8 @@ def runTest(self):
         self.assertIn('State', container_info)
         state = container_info['State']
         self.assertIn('ExitCode', state)
-        self.assertNotEqual(state['ExitCode'], 0)
+        if EXEC_DRIVER_IS_NATIVE:
+            self.assertNotEqual(state['ExitCode'], 0)
         self.assertIn('Running', state)
         self.assertEqual(state['Running'], False)
 
@@ -978,6 +989,7 @@ def runTest(self):
         self.client.remove_container(id, force=True)
 
 
+@unittest.skipIf(not EXEC_DRIVER_IS_NATIVE, 'Exec driver not native')
 class TestExecuteCommand(BaseTestCase):
     def runTest(self):
         container = self.client.create_container('busybox', 'cat',
@@ -991,6 +1003,7 @@ def runTest(self):
         self.assertEqual(res, expected)
 
 
+@unittest.skipIf(not EXEC_DRIVER_IS_NATIVE, 'Exec driver not native')
 class TestExecuteCommandString(BaseTestCase):
     def runTest(self):
         container = self.client.create_container('busybox', 'cat',
@@ -1004,6 +1017,7 @@ def runTest(self):
         self.assertEqual(res, expected)
 
 
+@unittest.skipIf(not EXEC_DRIVER_IS_NATIVE, 'Exec driver not native')
 class TestExecuteCommandStreaming(BaseTestCase):
     def runTest(self):
         container = self.client.create_container('busybox', 'cat',
@@ -1311,6 +1325,8 @@ def runTest(self):
         with open(os.path.join(base_dir, '.dockerignore'), 'w') as f:
             f.write("\n".join([
                 'node_modules',
+                'Dockerfile',
+                '.dockerginore',
                 '',  # empty line
             ]))
 
@@ -1329,6 +1345,8 @@ def runTest(self):
                 chunk = chunk.decode('utf-8')
             logs += chunk
         self.assertFalse('node_modules' in logs)
+        self.assertFalse('Dockerfile' in logs)
+        self.assertFalse('.dockerginore' in logs)
         self.assertTrue('not-ignored' in logs)
 
 #######################
@@ -1458,5 +1476,7 @@ def test_443(self):
 if __name__ == '__main__':
     c = docker.Client(base_url=DEFAULT_BASE_URL)
     c.pull('busybox')
+    exec_driver = c.info()['ExecutionDriver']
+    EXEC_DRIVER_IS_NATIVE = exec_driver.startswith('native')
     c.close()
     unittest.main()

tests/test.py

@@ -2115,11 +2115,10 @@ def test_load_config(self):
         folder = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, folder)
         dockercfg_path = os.path.join(folder, '.dockercfg')
-        f = open(dockercfg_path, 'w')
-        auth_ = base64.b64encode(b'sakuya:izayoi').decode('ascii')
-        f.write('auth = {0}\n'.format(auth_))
-        f.write('email = [email protected]')
-        f.close()
+        with open(dockercfg_path, 'w') as f:
+            auth_ = base64.b64encode(b'sakuya:izayoi').decode('ascii')
+            f.write('auth = {0}\n'.format(auth_))
+            f.write('email = [email protected]')
         cfg = docker.auth.load_config(dockercfg_path)
         self.assertTrue(docker.auth.INDEX_URL in cfg)
         self.assertNotEqual(cfg[docker.auth.INDEX_URL], None)
@@ -2175,18 +2174,18 @@ def test_tar_with_excludes(self):
                 (['test/foo', 'a.txt'], ['bar', 'bar/a.txt', 'bar/b.py',
                                          'bar/other.png', 'test']),
         ):
-            archive = docker.utils.tar(base, exclude=exclude)
-            tar = tarfile.open(fileobj=archive)
-            self.assertEqual(sorted(tar.getnames()), names)
+            with docker.utils.tar(base, exclude=exclude) as archive:
+                tar = tarfile.open(fileobj=archive)
+                self.assertEqual(sorted(tar.getnames()), names)
 
     def test_tar_with_empty_directory(self):
         base = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, base)
         for d in ['foo', 'bar']:
             os.makedirs(os.path.join(base, d))
-        archive = docker.utils.tar(base)
-        tar = tarfile.open(fileobj=archive)
-        self.assertEqual(sorted(tar.getnames()), ['bar', 'foo'])
+        with docker.utils.tar(base) as archive:
+            tar = tarfile.open(fileobj=archive)
+            self.assertEqual(sorted(tar.getnames()), ['bar', 'foo'])
 
     def test_tar_with_file_symlinks(self):
         base = tempfile.mkdtemp()
@@ -2195,19 +2194,19 @@ def test_tar_with_file_symlinks(self):
             f.write("content")
         os.makedirs(os.path.join(base, 'bar'))
         os.symlink('../foo', os.path.join(base, 'bar/foo'))
-        archive = docker.utils.tar(base)
-        tar = tarfile.open(fileobj=archive)
-        self.assertEqual(sorted(tar.getnames()), ['bar', 'bar/foo', 'foo'])
+        with docker.utils.tar(base) as archive:
+            tar = tarfile.open(fileobj=archive)
+            self.assertEqual(sorted(tar.getnames()), ['bar', 'bar/foo', 'foo'])
 
     def test_tar_with_directory_symlinks(self):
         base = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, base)
         for d in ['foo', 'bar']:
             os.makedirs(os.path.join(base, d))
         os.symlink('../foo', os.path.join(base, 'bar/foo'))
-        archive = docker.utils.tar(base)
-        tar = tarfile.open(fileobj=archive)
-        self.assertEqual(sorted(tar.getnames()), ['bar', 'bar/foo', 'foo'])
+        with docker.utils.tar(base) as archive:
+            tar = tarfile.open(fileobj=archive)
+            self.assertEqual(sorted(tar.getnames()), ['bar', 'bar/foo', 'foo'])
 
 
 class StreamTest(Cleanup, unittest.TestCase):
@@ -2293,21 +2292,21 @@ def test_early_stream_response(self):
             b'\r\n'
         ) + b'\r\n'.join(lines)
 
-        client = docker.Client(base_url="http+unix://" + self.socket_file)
-        for i in range(5):
-            try:
-                stream = client.build(
-                    path=self.build_context,
-                    stream=True
-                )
-                break
-            except requests.ConnectionError as e:
-                if i == 4:
-                    raise e
-
-        self.assertEqual(list(stream), [
-            str(i).encode() for i in range(50)])
-
+        with docker.Client(base_url="http+unix://" + self.socket_file) \
+                as client:
+            for i in range(5):
+                try:
+                    stream = client.build(
+                        path=self.build_context,
+                        stream=True
+                    )
+                    break
+                except requests.ConnectionError as e:
+                    if i == 4:
+                        raise e
+
+            self.assertEqual(list(stream), [
+                str(i).encode() for i in range(50)])
 
 if __name__ == '__main__':
     unittest.main()