Merge pull request #62 from altendky/add_no_cache_and_jobs_arguments

Add --no-cache and --jobs arguments

Author: stlehmann

Dockerfile

@@ -9,6 +9,8 @@ ARG PYQT_DATA_VISUALIZATION_VERSION="5.14.0"
 ARG PYQT_PURCHASING_VERSION="5.14.0"
 ARG PYQT_WEB_ENGINE_VERSION="5.14.0"
 
+ARG MAKEFLAGS=""
+
 ################################################################################
 # Build dependencies
 ################################################################################
@@ -68,7 +70,8 @@ RUN pacman --noconfirm -S \
 
 FROM build-dep AS pyqt5
 
-# Reuse argument from previous build scope
+# Reuse arguments from previous build scope
+ARG MAKEFLAGS
 ARG PYQT_VERSION
 
 # Download source tar
@@ -101,7 +104,8 @@ RUN find /upstream/ -name \*.pyi -exec cp {} . \;
 
 FROM build-dep AS pyqt-3d
 
-# Reuse argument from previous build scope
+# Reuse arguments from previous build scope
+ARG MAKEFLAGS
 ARG PYQT_3D_VERSION
 
 # Download source tar
@@ -133,7 +137,8 @@ RUN find /upstream/ -name \*.pyi -exec cp {} . \;
 
 FROM build-dep AS pyqt-chart
 
-# Reuse argument from previous build scope
+# Reuse arguments from previous build scope
+ARG MAKEFLAGS
 ARG PYQT_CHART_VERSION
 
 # Download source tar
@@ -165,7 +170,8 @@ RUN find /upstream/ -name \*.pyi -exec cp {} . \;
 
 FROM build-dep AS pyqt-data-visualization
 
-# Reuse argument from previous build scope
+# Reuse arguments from previous build scope
+ARG MAKEFLAGS
 ARG PYQT_DATA_VISUALIZATION_VERSION
 
 # Download source tar
@@ -197,7 +203,8 @@ RUN find /upstream/ -name \*.pyi -exec cp {} . \;
 
 FROM build-dep AS pyqt-purchasing
 
-# Reuse argument from previous build scope
+# Reuse arguments from previous build scope
+ARG MAKEFLAGS
 ARG PYQT_PURCHASING_VERSION
 
 # Download source tar
@@ -229,7 +236,8 @@ RUN find /upstream/ -name \*.pyi -exec cp {} . \;
 
 FROM build-dep AS pyqt-web-engine
 
-# Reuse argument from previous build scope
+# Reuse arguments from previous build scope
+ARG MAKEFLAGS
 ARG PYQT_WEB_ENGINE_VERSION
 
 # Download source tar

build_upstream.py

@@ -28,6 +28,17 @@ def parse_args() -> argparse.Namespace:
                         help="Directory to find package(s) to be built. "
                              "Defaults to ./pkg")
 
+    # noinspection PyTypeChecker
+    parser.add_argument('-j', '--jobs', type=int,
+                        default=1,
+                        help="The number of jobs to launch in parallel. "
+                             "Defaults to 1")
+
+    # noinspection PyTypeChecker
+    parser.add_argument('--no-cache',
+                        action='store_true',
+                        help="Do not use Docker caches. Defaults to false")
+
     return parser.parse_args()
 
 
@@ -36,20 +47,22 @@ def main():
 
     docker_client = docker.from_env()
 
-    image_id = build_image(docker_client, args.dockerfile)
+    image_id = build_image(docker_client, args.dockerfile, args.jobs, args.no_cache)
 
     extract_output(docker_client, image_id, args.output_dir)
 
 
-def build_image(docker_client: DockerClient, dockerfile: Path) -> str:
+def build_image(docker_client: DockerClient, dockerfile: Path, jobs: int, no_cache: bool) -> str:
     image_name = "pyqt5-stubs"
 
     # Using low-level API so that we can log as it occurs instead of only
     # after build has finished/failed
     resp = docker_client.api.build(
         path=str(dockerfile.parent),
         rm=True,
-        tag=image_name)
+        tag=image_name,
+        buildargs={"MAKEFLAGS": f"-j{jobs}"},
+        nocache=no_cache)
 
     image_id: str = typing.cast(str, None)
     for chunk in json_stream(resp):