fix build image

Author: joshuanianji

scripts/build-image.py

@@ -8,8 +8,10 @@
 
 
 def get_latest_sha():
-    idris_latest_sha = requests.get('https://api.github.com/repos/idris-lang/Idris2/commits').json()[0]['sha']
-    lsp_latest_sha = requests.get('https://api.github.com/repos/idris-community/idris2-lsp/commits').json()[0]['sha']
+    idris_latest_sha = requests.get(
+        'https://api.github.com/repos/idris-lang/Idris2/commits').json()[0]['sha']
+    lsp_latest_sha = requests.get(
+        'https://api.github.com/repos/idris-community/idris2-lsp/commits').json()[0]['sha']
     return {
         'idris': idris_latest_sha,
         'lsp': lsp_latest_sha
@@ -40,34 +42,34 @@ def build_image_sha(image: str, sha_info: dict, idris_base_version: str, tag: st
         # for sha-specific devcontainer images, we also need to pass in the sha from the idris2 github repo
         # by default, this is the latest idris2 sha.
         idris_sha = sha_info['idris'] if idris_base_version == 'latest' else idris_base_version
-        subprocess.run([ 'docker', 'build', '-t', tag, '-f', dockerfile, 
-                        '--build-arg', f'IDRIS_SHA={idris_sha}', 
-                        '--build-arg', f'IDRIS_LSP_SHA={sha_info["lsp"]}', 
+        subprocess.run(['docker', 'build', '-t', tag, '-f', dockerfile,
+                        '--build-arg', f'IDRIS_SHA={idris_sha}',
+                        '--build-arg', f'IDRIS_LSP_SHA={sha_info["lsp"]}',
                         '--build-arg', f'IDRIS_VERSION={idris_base_version}',
-                        '.' ])
+                        '.'])
     else:
-        subprocess.run([ 'docker', 'build', '-t', tag, '-f', dockerfile, 
-                        '--build-arg', f'IDRIS_SHA={sha_info["idris"]}', '.' ])
+        subprocess.run(['docker', 'build', '-t', tag, '-f', dockerfile,
+                        '--build-arg', f'IDRIS_SHA={sha_info["idris"]}', '.'])
     print(f'Image built with tag {tag}')
 
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Builds a docker image')
     parser.add_argument(
-        '--image', 
+        '--image',
         help='The image to build. One of (base | debian | ubuntu | devcontainer). Defaults to base.',
         default='base')
     group = parser.add_mutually_exclusive_group()
     group.add_argument(
-        '--version', 
+        '--version',
         help='Idris version to use. Defaults to `latest`, and of the form `v0.6.0`',
         default='latest')
     group.add_argument(
-        '--sha', 
+        '--sha',
         help='Idris/Idris LSP SHA to use. Should not be used with `--version`. SHAs also cannot be used with base or debian images.',
         default=None)
     parser.add_argument(
-        '--tag', 
+        '--tag',
         help='Tag to use for the image. Defaults to `{image}-{version}` or `{image}-{tag}.',
         default=None)
     parser.add_argument(
@@ -80,7 +82,7 @@ def build_image_sha(image: str, sha_info: dict, idris_base_version: str, tag: st
     if args.image not in ['base', 'debian', 'ubuntu', 'devcontainer']:
         print('Invalid image. Must be one of (base | debian | ubuntu | devcontainer).')
         exit(1)
-    
+
     if args.version and args.version != 'latest':
         # Build versioned image.
         dockerfile = f'{args.image}.Dockerfile'
@@ -90,18 +92,28 @@ def build_image_sha(image: str, sha_info: dict, idris_base_version: str, tag: st
         # build image
         if args.image == 'devcontainer':
             lsp_version = get_lsp_version(args.version)
-            subprocess.run([ 'docker', 'build', '-t', tag, '-f', dockerfile, 
-                            '--build-arg', f'IDRIS_VERSION={args.version}', 
-                            '--build-arg', f'IDRIS_LSP_VERSION={lsp_version}', 
-                            '.' ])
+            subprocess.run(['docker', 'build', '-t', tag, '-f', dockerfile,
+                            '--build-arg', f'IDRIS_VERSION={args.version}',
+                            '--build-arg', f'IDRIS_LSP_VERSION={lsp_version}',
+                            '.'])
         else:
-            subprocess.run([ 'docker', 'build', '-t', tag, '-f', dockerfile, '--build-arg', f'IDRIS_VERSION={args.version}', '.' ])
+            subprocess.run(['docker', 'build', '-t', tag, '-f', dockerfile,
+                           '--build-arg', f'IDRIS_VERSION={args.version}', '.'])
         print(f'Image built with tag {tag}')
 
     elif args.version == 'latest':
-        sha_info = get_latest_sha()
-        tag = f'{args.image}-latest' if not args.tag else args.tag
-        build_image_sha(args.image, sha_info, args.idris_base_version, tag)
+        if args.image in ['base', 'devcontainer']:
+            # base and devcontainer need idris' latest SHA to build
+            sha_info = get_latest_sha()
+            tag = f'{args.image}-latest' if not args.tag else args.tag
+            build_image_sha(args.image, sha_info, args.idris_base_version, tag)
+
+        else:
+            tag = f'{args.image}-latest' if not args.tag else args.tag
+            print(f'Building {args.image}.Dockerfile with tag {tag}')
+            subprocess.run(['docker', 'build', '-t', tag, '-f',
+                            f'{args.image}.Dockerfile', '.'])
+            print(f'Image built with tag {tag}')
 
     elif args.sha:
         if args.image in ['base', 'debian']:
@@ -117,4 +129,4 @@ def build_image_sha(image: str, sha_info: dict, idris_base_version: str, tag: st
 
     else:
         print('This should never happen.')
-        exit(1)
+        exit(1)