[build] Run docker architecture builds in paralle

elastic · May 13, 2024 · 331d17d · 331d17d
1 parent af91e55
commit 331d17d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/src/dev/build/tasks/os_packages/create_os_package_tasks.ts b/src/dev/build/tasks/os_packages/create_os_package_tasks.ts
@@ -84,22 +84,24 @@ export const CreateDockerServerless: Task = {
   description: 'Creating Docker Serverless image',
 
   async run(config, log, build) {
-    await runDockerGenerator(config, log, build, {
-      architecture: 'x64',
-      baseImage: 'ubuntu',
-      context: false,
-      serverless: true,
-      image: true,
-      dockerBuildDate,
-    });
-    await runDockerGenerator(config, log, build, {
-      architecture: 'aarch64',
-      baseImage: 'ubuntu',
-      context: false,
-      serverless: true,
-      image: true,
-      dockerBuildDate,
-    });
+    await Promise.all([
+      runDockerGenerator(config, log, build, {
+        architecture: 'x64',
+        baseImage: 'ubuntu',
+        context: false,
+        serverless: true,
+        image: true,
+        dockerBuildDate,
+      }),
+      runDockerGenerator(config, log, build, {
+        architecture: 'aarch64',
+        baseImage: 'ubuntu',
+        context: false,
+        serverless: true,
+        image: true,
+        dockerBuildDate,
+      }),
+    ]);
   },
 };
 

diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/build_docker_sh.template.ts b/src/dev/build/tasks/os_packages/docker_generator/templates/build_docker_sh.template.ts
@@ -27,8 +27,8 @@ function generator({
   const dockerTargetName = `${imageTag}${imageFlavor}:${tag}`;
   const dockerArchitecture = architecture === 'aarch64' ? 'linux/arm64' : 'linux/amd64';
   const dockerBuild = dockerCrossCompile
-    ? `docker buildx build --platform ${dockerArchitecture} -t ${dockerTargetName} -f Dockerfile . || exit 1;`
-    : `docker build -t ${dockerTargetName} -f Dockerfile . || exit 1;`;
+    ? `docker buildx build --quiet --platform ${dockerArchitecture} -t ${dockerTargetName} -f Dockerfile . || exit 1;`
+    : `docker build --quiet -t ${dockerTargetName} -f Dockerfile . || exit 1;`;
   return dedent(`
   #!/usr/bin/env bash
   #