From 37372a6f93ce6786dac97d35ff1555efa6557d72 Mon Sep 17 00:00:00 2001 From: Rongxin Liu Date: Wed, 19 Jan 2022 14:04:57 -0500 Subject: [PATCH] minor bug fix on pulling docker image, bump version number --- cli50/__main__.py | 13 +++++++------ setup.py | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cli50/__main__.py b/cli50/__main__.py index 4985875..fff4d21 100644 --- a/cli50/__main__.py +++ b/cli50/__main__.py @@ -163,19 +163,20 @@ def main(): # Check Docker Hub for newer image if not args["fast"]: - # Determine platform architecture - arch = json.loads(subprocess.check_output([ - "docker", "inspect", f"{IMAGE}:{args['tag']}" - ], stderr=subprocess.DEVNULL).decode("utf-8"))[0]["Architecture"] - # Remote digest try: digest = requests.get(f"https://registry.hub.docker.com/v2/repositories/{IMAGE}/tags/{args['tag']}").json()["images"][0]["digest"] except requests.RequestException: digest = None - + # Local digest try: + + # Determine platform architecture + arch = json.loads(subprocess.check_output([ + "docker", "inspect", f"{IMAGE}:{args['tag']}" + ], stderr=subprocess.DEVNULL).decode("utf-8"))[0]["Architecture"] + Manifest = json.loads(subprocess.check_output([ "docker", "manifest", "inspect", f"{IMAGE}:{args['tag']}" ], stderr=subprocess.DEVNULL).decode("utf-8")) diff --git a/setup.py b/setup.py index ffaebd4..3386264 100644 --- a/setup.py +++ b/setup.py @@ -23,6 +23,6 @@ "console_scripts": ["cli50=cli50.__main__:main"] }, url="https://github.com/cs50/cli50", - version="7.1.5", + version="7.1.6", include_package_data=True )