Merge pull request #1902 from docker/3.0.1-release

3.0.1 release

docker/api/daemon.py

@@ -139,7 +139,7 @@ def login(self, username, password=None, email=None, registry=None,
         if response.status_code == 200:
             if 'auths' not in self._auth_configs:
                 self._auth_configs['auths'] = {}
-            self._auth_configs[registry or auth.INDEX_NAME] = req_data
+            self._auth_configs['auths'][registry or auth.INDEX_NAME] = req_data
         return self._result(response, json=True)
 
     def ping(self):

docker/utils/utils.py

@@ -97,16 +97,16 @@ def create_archive(root, files=None, fileobj=None, gzip=False):
     for path in files:
         full_path = os.path.join(root, path)
 
-        if os.lstat(full_path).st_mode & os.R_OK == 0:
-            raise IOError(
-                'Can not access file in context: {}'.format(full_path)
-            )
         i = t.gettarinfo(full_path, arcname=path)
         if i is None:
             # This happens when we encounter a socket file. We can safely
             # ignore it and proceed.
             continue
 
+        # Workaround https://bugs.python.org/issue32713
+        if i.mtime < 0 or i.mtime > 8**11 - 1:
+            i.mtime = int(i.mtime)
+
         if constants.IS_WINDOWS_PLATFORM:
             # Windows doesn't keep track of the execute bit, so we make files
             # and directories executable by default.
@@ -117,7 +117,9 @@ def create_archive(root, files=None, fileobj=None, gzip=False):
                 with open(full_path, 'rb') as f:
                     t.addfile(i, f)
             except IOError:
-                t.addfile(i, None)
+                raise IOError(
+                    'Can not read file in context: {}'.format(full_path)
+                )
         else:
             # Directories, FIFOs, symlinks... don't need to be read.
             t.addfile(i, None)

docker/version.py

@@ -1,2 +1,2 @@
-version = "3.0.0"
+version = "3.0.1"
 version_info = tuple([int(d) for d in version.split("-")[0].split(".")])

docs/change-log.md

@@ -1,6 +1,20 @@
 Change log
 ==========
 
+3.0.1
+-----
+
+[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/43?closed=1)
+
+### Bugfixes
+
+* Fixed a bug where `APIClient.login` didn't populate the `_auth_configs`
+  dictionary properly, causing subsequent `pull` and `push` operations to fail
+* Fixed a bug where some build context files were incorrectly recognized as
+  being inaccessible.
+* Fixed a bug where files with a negative mtime value would
+  cause errors when included in a build context
+
 3.0.0
 -----
 

tests/unit/api_test.py

@@ -212,6 +212,24 @@ def test_search(self):
             timeout=DEFAULT_TIMEOUT_SECONDS
         )
 
+    def test_login(self):
+        self.client.login('sakuya', 'izayoi')
+        fake_request.assert_called_with(
+            'POST', url_prefix + 'auth',
+            data=json.dumps({'username': 'sakuya', 'password': 'izayoi'}),
+            timeout=DEFAULT_TIMEOUT_SECONDS,
+            headers={'Content-Type': 'application/json'}
+        )
+
+        assert self.client._auth_configs['auths'] == {
+            'docker.io': {
+                'email': None,
+                'password': 'izayoi',
+                'username': 'sakuya',
+                'serveraddress': None,
+            }
+        }
+
     def test_events(self):
         self.client.events()
 

tests/unit/utils_test.py

@@ -933,7 +933,10 @@ def test_tar_with_empty_directory(self):
             tar_data = tarfile.open(fileobj=archive)
             assert sorted(tar_data.getnames()) == ['bar', 'foo']
 
-    @pytest.mark.skipif(IS_WINDOWS_PLATFORM, reason='No chmod on Windows')
+    @pytest.mark.skipif(
+        IS_WINDOWS_PLATFORM or os.geteuid() == 0,
+        reason='root user always has access ; no chmod on Windows'
+    )
     def test_tar_with_inaccessible_file(self):
         base = tempfile.mkdtemp()
         full_path = os.path.join(base, 'foo')
@@ -944,8 +947,9 @@ def test_tar_with_inaccessible_file(self):
         with pytest.raises(IOError) as ei:
             tar(base)
 
-        assert 'Can not access file in context: {}'.format(full_path) in \
+        assert 'Can not read file in context: {}'.format(full_path) in (
             ei.exconly()
+        )
 
     @pytest.mark.skipif(IS_WINDOWS_PLATFORM, reason='No symlinks on Windows')
     def test_tar_with_file_symlinks(self):
@@ -995,6 +999,18 @@ def test_tar_socket_file(self):
             tar_data = tarfile.open(fileobj=archive)
             assert sorted(tar_data.getnames()) == ['bar', 'foo']
 
+    def tar_test_negative_mtime_bug(self):
+        base = tempfile.mkdtemp()
+        filename = os.path.join(base, 'th.txt')
+        self.addCleanup(shutil.rmtree, base)
+        with open(filename, 'w') as f:
+            f.write('Invisible Full Moon')
+        os.utime(filename, (12345, -3600.0))
+        with tar(base) as archive:
+            tar_data = tarfile.open(fileobj=archive)
+            assert tar_data.getnames() == ['th.txt']
+            assert tar_data.getmember('th.txt').mtime == -3600
+
 
 class ShouldCheckDirectoryTest(unittest.TestCase):
     exclude_patterns = [