[build] Cross compile docker images

src/dev/build/args.test.ts

@@ -36,6 +36,7 @@ it('build default and oss dist for current platform, without packages, by defaul
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": false,
+        "dockerCrossCompile": false,
         "dockerPush": false,
         "dockerTagQualifier": null,
         "downloadCloudDependencies": true,
@@ -67,6 +68,7 @@ it('builds packages if --all-platforms is passed', () => {
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": true,
+        "dockerCrossCompile": false,
         "dockerPush": false,
         "dockerTagQualifier": null,
         "downloadCloudDependencies": true,
@@ -98,6 +100,7 @@ it('limits packages if --rpm passed with --all-platforms', () => {
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": true,
+        "dockerCrossCompile": false,
         "dockerPush": false,
         "dockerTagQualifier": null,
         "downloadCloudDependencies": true,
@@ -129,6 +132,7 @@ it('limits packages if --deb passed with --all-platforms', () => {
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": false,
+        "dockerCrossCompile": false,
         "dockerPush": false,
         "dockerTagQualifier": null,
         "downloadCloudDependencies": true,
@@ -161,6 +165,7 @@ it('limits packages if --docker passed with --all-platforms', () => {
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": false,
+        "dockerCrossCompile": false,
         "dockerPush": false,
         "dockerTagQualifier": null,
         "downloadCloudDependencies": true,
@@ -200,6 +205,7 @@ it('limits packages if --docker passed with --skip-docker-ubi and --all-platform
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": false,
+        "dockerCrossCompile": false,
         "dockerPush": false,
         "dockerTagQualifier": null,
         "downloadCloudDependencies": true,
@@ -232,6 +238,7 @@ it('limits packages if --all-platforms passed with --skip-docker-ubuntu', () =>
         "createGenericFolders": true,
         "createPlatformFolders": true,
         "createRpmPackage": true,
+        "dockerCrossCompile": false,
         "dockerPush": false,
         "dockerTagQualifier": null,
         "downloadCloudDependencies": true,

src/dev/build/args.ts

@@ -22,6 +22,7 @@ export function readCliArgs(argv: string[]) {
       'skip-os-packages',
       'rpm',
       'deb',
+      'docker-cross-compile',
       'docker-images',
       'docker-push',
       'skip-docker-contexts',
@@ -52,6 +53,7 @@ export function readCliArgs(argv: string[]) {
       rpm: null,
       deb: null,
       'docker-images': null,
+      'docker-cross-compile': false,
       'docker-push': false,
       'docker-tag-qualifier': null,
       'version-qualifier': '',
@@ -112,6 +114,7 @@ export function readCliArgs(argv: string[]) {
   const buildOptions: BuildOptions = {
     isRelease: Boolean(flags.release),
     versionQualifier: flags['version-qualifier'],
+    dockerCrossCompile: Boolean(flags['docker-cross-compile']),
     dockerPush: Boolean(flags['docker-push']),
     dockerTagQualifier: flags['docker-tag-qualifier'],
     initialize: !Boolean(flags['skip-initialize']),

src/dev/build/build_distributables.ts

@@ -13,6 +13,7 @@ import * as Tasks from './tasks';
 
 export interface BuildOptions {
   isRelease: boolean;
+  dockerCrossCompile: boolean;
   dockerPush: boolean;
   dockerTagQualifier: string | null;
   downloadFreshNode: boolean;

src/dev/build/cli.ts

@@ -39,6 +39,7 @@ if (showHelp) {
         --rpm                   {dim Only build the rpm packages}
         --deb                   {dim Only build the deb packages}
         --docker-images         {dim Only build the Docker images}
+        --docker-cross-compile  {dim Produce arm64 and amd64 Docker images}
         --docker-contexts       {dim Only build the Docker build contexts}
         --skip-docker-ubi       {dim Don't build the docker ubi image}
         --skip-docker-ubuntu    {dim Don't build the docker ubuntu image}

src/dev/build/lib/build.test.ts

@@ -32,6 +32,7 @@ const config = new Config(
     buildSha: 'abcd1234',
     buildVersion: '8.0.0',
   },
+  false,
   '',
   false,
   true

src/dev/build/lib/config.test.ts

@@ -29,6 +29,7 @@ const setup = async ({ targetAllPlatforms = true }: { targetAllPlatforms?: boole
   return await Config.create({
     isRelease: true,
     targetAllPlatforms,
+    dockerCrossCompile: false,
     dockerPush: false,
     dockerTagQualifier: '',
   });

src/dev/build/lib/config.ts

@@ -17,6 +17,7 @@ interface Options {
   isRelease: boolean;
   targetAllPlatforms: boolean;
   versionQualifier?: string;
+  dockerCrossCompile: boolean;
   dockerTagQualifier: string | null;
   dockerPush: boolean;
 }
@@ -35,6 +36,7 @@ export class Config {
     isRelease,
     targetAllPlatforms,
     versionQualifier,
+    dockerCrossCompile,
     dockerTagQualifier,
     dockerPush,
   }: Options) {
@@ -51,6 +53,7 @@ export class Config {
         versionQualifier,
         pkg,
       }),
+      dockerCrossCompile,
       dockerTagQualifier,
       dockerPush,
       isRelease
@@ -63,6 +66,7 @@ export class Config {
     private readonly nodeVersion: string,
     private readonly repoRoot: string,
     private readonly versionInfo: VersionInfo,
+    private readonly dockerCrossCompile: boolean,
     private readonly dockerTagQualifier: string | null,
     private readonly dockerPush: boolean,
     public readonly isRelease: boolean
@@ -96,6 +100,13 @@ export class Config {
     return this.dockerPush;
   }
 
+  /**
+   * Get docker cross compile
+   */
+  getDockerCrossCompile() {
+    return this.dockerCrossCompile;
+  }
+
   /**
    * Convert an absolute path to a relative path, based from the repo
    */

src/dev/build/lib/runner.test.ts

@@ -50,6 +50,7 @@ const setup = async () => {
     isRelease: true,
     targetAllPlatforms: true,
     versionQualifier: '-SNAPSHOT',
+    dockerCrossCompile: false,
     dockerPush: false,
     dockerTagQualifier: '',
   });

src/dev/build/tasks/download_cloud_dependencies.ts

@@ -20,18 +20,24 @@ export const DownloadCloudDependencies: Task = {
       const version = config.getBuildVersion();
       const buildId = id.match(/[0-9]\.[0-9]\.[0-9]-[0-9a-z]{8}/);
       const buildIdUrl = buildId ? `${buildId[0]}/` : '';
-      const architecture = process.arch === 'arm64' ? 'arm64' : 'x86_64';
-      const url = `https://${subdomain}-no-kpi.elastic.co/${buildIdUrl}downloads/beats/${beat}/${beat}-${version}-linux-${architecture}.tar.gz`;
-      const checksum = await downloadToString({ log, url: url + '.sha512', expectStatus: 200 });
-      const destination = config.resolveFromRepo('.beats', Path.basename(url));
-      return downloadToDisk({
-        log,
-        url,
-        destination,
-        shaChecksum: checksum.split(' ')[0],
-        shaAlgorithm: 'sha512',
-        maxAttempts: 3,
+
+      const localArchitecture = [process.arch === 'arm64' ? 'arm64' : 'x86_64'];
+      const allArchitectures = ['arm64', 'x86_64'];
+      const architectures = config.getDockerCrossCompile() ? allArchitectures : localArchitecture;
+      const downloads = architectures.map(async (arch) => {
+        const url = `https://${subdomain}-no-kpi.elastic.co/${buildIdUrl}downloads/beats/${beat}/${beat}-${version}-linux-${arch}.tar.gz`;
+        const checksum = await downloadToString({ log, url: url + '.sha512', expectStatus: 200 });
+        const destination = config.resolveFromRepo('.beats', Path.basename(url));
+        return downloadToDisk({
+          log,
+          url,
+          destination,
+          shaChecksum: checksum.split(' ')[0],
+          shaAlgorithm: 'sha512',
+          maxAttempts: 3,
+        });
       });
+      return Promise.all(downloads);
     };
 
     let buildId = '';

src/dev/build/tasks/nodejs/download_node_builds_task.test.ts

@@ -39,6 +39,7 @@ async function setup({ failOnUrl }: { failOnUrl?: string } = {}) {
   const config = await Config.create({
     isRelease: true,
     targetAllPlatforms: true,
+    dockerCrossCompile: false,
     dockerPush: false,
     dockerTagQualifier: '',
   });

src/dev/build/tasks/nodejs/extract_node_builds_task.test.ts

@@ -43,6 +43,7 @@ async function setup() {
   const config = await Config.create({
     isRelease: true,
     targetAllPlatforms: true,
+    dockerCrossCompile: false,
     dockerPush: false,
     dockerTagQualifier: '',
   });

src/dev/build/tasks/nodejs/verify_existing_node_builds_task.test.ts

@@ -48,6 +48,7 @@ async function setup(actualShaSums?: Record<string, string>) {
   const config = await Config.create({
     isRelease: true,
     targetAllPlatforms: true,
+    dockerCrossCompile: false,
     dockerPush: false,
     dockerTagQualifier: '',
   });

src/dev/build/tasks/os_packages/docker_generator/run.ts

@@ -76,6 +76,7 @@ export async function runDockerGenerator(
 
   const dockerPush = config.getDockerPush();
   const dockerTagQualifier = config.getDockerTagQualfiier();
+  const dockerCrossCompile = config.getDockerCrossCompile();
   const publicArtifactSubdomain = config.isRelease ? 'artifacts' : 'snapshots-no-kpi';
 
   const scope: TemplateContext = {
@@ -110,7 +111,7 @@ export async function runDockerGenerator(
     arm64: 'aarch64',
   };
   const buildArchitectureSupported = hostTarget[process.arch] === flags.architecture;
-  if (flags.architecture && !buildArchitectureSupported) {
+  if (flags.architecture && !buildArchitectureSupported && !dockerCrossCompile) {
     return;
   }
 

src/dev/build/tasks/os_packages/docker_generator/templates/build_docker_sh.template.ts

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