support docker-cross-compile flag

elastic · Mar 23, 2022 · 0a73165 · 0a73165
1 parent 189fa27
commit 0a73165
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 1 deletion.
diff --git a/src/dev/build/args.test.ts b/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,

diff --git a/src/dev/build/args.ts b/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']),

diff --git a/src/dev/build/build_distributables.ts b/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;

diff --git a/src/dev/build/cli.ts b/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}

diff --git a/src/dev/build/lib/config.ts b/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
    */

diff --git a/src/dev/build/tasks/os_packages/docker_generator/run.ts b/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;
   }