From 756566570c8c6e45a548bb6d39a4fdd6eca99007 Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@elastic.co>
Date: Fri, 25 Mar 2022 10:43:24 -0500
Subject: [PATCH 1/3] [build] Only use buildx if cross compiling

---
 src/dev/build/tasks/os_packages/docker_generator/run.ts     | 1 +
 .../tasks/os_packages/docker_generator/template_context.ts  | 1 +
 .../docker_generator/templates/build_docker_sh.template.ts  | 6 +++++-
 3 files changed, 7 insertions(+), 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
index 3152f07628fc9..c406fe47c1542 100644
--- 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
index 524cfcef18284..35977d47aaaa7 100644
--- 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
index a14de2a0581ff..f8ad98c8dd0c7 100644
--- 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}
 

From a35480cf03316d163b876e6357f5100546a813e8 Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@elastic.co>
Date: Thu, 7 Apr 2022 10:09:58 -0500
Subject: [PATCH 2/3] reuse variable

---
 .../docker_generator/templates/build_docker_sh.template.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index f8ad98c8dd0c7..e9365447e959f 100644
--- 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
@@ -26,7 +26,7 @@ function generator({
   }`;
   const dockerArchitecture = architecture === 'aarch64' ? 'linux/arm64' : 'linux/amd64';
   const dockerBuild = dockerCrossCompile
-    ? `docker build -t ${imageTag}${imageFlavor}:${version} -f Dockerfile . || exit 1;`
+    ? `docker build -t ${dockerTargetName} -f Dockerfile . || exit 1;`
     : `docker buildx build --platform ${dockerArchitecture} -t ${dockerTargetName} -f Dockerfile . || exit 1;`;
   return dedent(`
   #!/usr/bin/env bash

From d0fe486906e8b29de9190a8085c17fea69af952d Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@elastic.co>
Date: Thu, 7 Apr 2022 10:13:49 -0500
Subject: [PATCH 3/3] fix conditional

---
 .../docker_generator/templates/build_docker_sh.template.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
index e9365447e959f..316428d46a957 100644
--- 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
@@ -26,8 +26,8 @@ function generator({
   }`;
   const dockerArchitecture = architecture === 'aarch64' ? 'linux/arm64' : 'linux/amd64';
   const dockerBuild = dockerCrossCompile
-    ? `docker build -t ${dockerTargetName} -f Dockerfile . || exit 1;`
-    : `docker buildx build --platform ${dockerArchitecture} -t ${dockerTargetName} -f Dockerfile . || exit 1;`;
+    ? `docker buildx build --platform ${dockerArchitecture} -t ${dockerTargetName} -f Dockerfile . || exit 1;`
+    : `docker build -t ${dockerTargetName} -f Dockerfile . || exit 1;`;
   return dedent(`
   #!/usr/bin/env bash
   #