[build] Only use buildx if cross compiling

elastic · Mar 25, 2022 · 7565665 · 7565665
1 parent 32ac1a5
commit 7565665
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/dev/build/tasks/os_packages/docker_generator/run.ts b/src/dev/build/tasks/os_packages/docker_generator/run.ts
@@ -92,6 +92,7 @@ export async function runDockerGenerator(
     dockerTargetFilename,
     dockerPush,
     dockerTagQualifier,
+    dockerCrossCompile,
     baseOSImage,
     dockerBuildDate,
     ubi: flags.ubi,

diff --git a/src/dev/build/tasks/os_packages/docker_generator/template_context.ts b/src/dev/build/tasks/os_packages/docker_generator/template_context.ts
@@ -16,6 +16,7 @@ export interface TemplateContext {
   artifactsDir: string;
   dockerPush: boolean;
   dockerTagQualifier: string | null;
+  dockerCrossCompile: boolean;
   imageTag: string;
   dockerBuildDir: string;
   dockerTargetFilename: string;

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
@@ -15,6 +15,7 @@ function generator({
   imageFlavor,
   dockerPush,
   dockerTagQualifier,
+  dockerCrossCompile,
   version,
   dockerTargetFilename,
   baseOSImage,
@@ -24,6 +25,9 @@ function generator({
     dockerTagQualifier ? '-' + dockerTagQualifier : ''
   }`;
   const dockerArchitecture = architecture === 'aarch64' ? 'linux/arm64' : 'linux/amd64';
+  const dockerBuild = dockerCrossCompile
+    ? `docker build -t ${imageTag}${imageFlavor}:${version} -f Dockerfile . || exit 1;`
+    : `docker buildx build --platform ${dockerArchitecture} -t ${dockerTargetName} -f Dockerfile . || exit 1;`;
   return dedent(`
   #!/usr/bin/env bash
   #
@@ -60,7 +64,7 @@ function generator({
   retry_docker_pull ${baseOSImage}
 
   echo "Building: kibana${imageFlavor}-docker"; \\
-  docker buildx build --platform ${dockerArchitecture} -t ${dockerTargetName} -f Dockerfile . || exit 1;
+  ${dockerBuild}
 
   docker save ${dockerTargetName} | gzip -c > ${dockerTargetFilename}