Skip to content

D
docker-py
Dal (branch)/etiket değiştir
  1. 04 Nis, 2019 2 kayıt (commit)
  3. 03 Nis, 2019 1 kayıt (commit)
  5. 28 Mar, 2019 2 kayıt (commit)
    • Ulysses Souza's avatar
      Merge pull request #2298 from ijc/fix-docker-version-detection-script · f97c577c
      Ulysses Souza yazdı 
      scripts/version.py: Use regex grouping to extract the version
      f97c577c
    • Ian Campbell's avatar
      scripts/version.py: Use regex grouping to extract the version · b0abdac9
      Ian Campbell yazdı 
      The `lstrip` and `rstrip` functions take a set of characters to remove, not a
prefix/suffix. Thus `rstrip('-x86_64')` will remove any trailing characters in
the string `'-x86_64'` in any order (in effect it strips the suffix matching
the regex `[-_x468]*`). So with `18.09.4` it removes the `4` suffix resulting
in trying to `int('')` later on:

    Traceback (most recent call last):
      File "/src/scripts/versions.py", line 80, in <module>
        main()
      File "/src/scripts/versions.py", line 73, in main
        versions, reverse=True, key=operator.attrgetter('order')
      File "/src/scripts/versions.py", line 52, in order
        return (int(self.major), int(self.minor), int(self.patch)) + stage
    ValueError: invalid literal for int() with base 10: ''

Since we no longer need to check for the arch suffix (since it no longer
appears in the URLs we are traversing) we could just drop the `rstrip` and
invent a local prefix stripping helper to replace `lstrip('docker-')`. Instead
lets take advantage of the behaviour of `re.findall` which is that if the regex
contains a single `()` match that will be returned. This lets us match exactly
the sub-section of the regex we require.

While editing the regex, also ensure that the suffix is precisely `.tgz` and
not merely `tgz` by adding an explicit `\.`, previously the literal `.` would
be swallowed by the `.*` instead.
Signed-off-by: 's avatarIan Campbell <ijc@docker.com>
      b0abdac9
  7. 27 Mar, 2019 1 kayıt (commit)
  9. 26 Mar, 2019 5 kayıt (commit)
  11. 25 Mar, 2019 5 kayıt (commit)
  13. 23 Mar, 2019 2 kayıt (commit)
  15. 22 Mar, 2019 4 kayıt (commit)
  17. 20 Mar, 2019 7 kayıt (commit)
  19. 19 Mar, 2019 2 kayıt (commit)
  21. 18 Mar, 2019 3 kayıt (commit)
  23. 17 Mar, 2019 1 kayıt (commit)
  25. 16 Mar, 2019 2 kayıt (commit)
  27. 15 Mar, 2019 2 kayıt (commit)
  29. 13 Mar, 2019 1 kayıt (commit)