ref(docker): Support multi-arch images through docker buildkit

getsentry · Sep 20, 2024 · 15f20bd · 15f20bd
1 parent 6f7fa1c
commit 15f20bd
Showing 1 changed file with 42 additions and 4 deletions.
diff --git a/src/targets/docker.ts b/src/targets/docker.ts
@@ -86,7 +86,7 @@ export class DockerTarget extends BaseTarget {
    * Pushes the the source image into local
    * @param revision Image tag, usually the git revision
    */
-  public async pull(revision: string): Promise<any> {
+  async pull(revision: string): Promise<any> {
     this.logger.debug('Pulling source image...');
     const sourceImage = renderTemplateSafe(this.dockerConfig.sourceTemplate, {
       ...this.dockerConfig,
@@ -105,7 +105,7 @@ export class DockerTarget extends BaseTarget {
    * @param sourceRevision The tag/revision for the source image
    * @param version The release version for the target image
    */
-  public async push(sourceRevision: string, version: string): Promise<any> {
+  async push(sourceRevision: string, version: string): Promise<any> {
     const sourceImage = renderTemplateSafe(this.dockerConfig.sourceTemplate, {
       ...this.dockerConfig,
       revision: sourceRevision,
@@ -124,6 +124,38 @@ export class DockerTarget extends BaseTarget {
     );
   }
 
+
+  async hasBuildKit(): Promise<boolean> {
+    return spawnProcess(DOCKER_BIN, ['buildx', 'version']).then(() => true).catch(_ => false);
+  }
+
+  /**
+   * Copies an existing local or remote docker image to a new destination.
+   *
+   * Requires BuildKit / `docker buildx` to be installed.
+   *
+   * @param sourceRevision The tag/revision for the source image
+   * @param version The release version for the target image
+   */
+  async copy(sourceRevision: string, version: string): Promise<any> {
+    const sourceImage = renderTemplateSafe(this.dockerConfig.sourceTemplate, {
+      ...this.dockerConfig,
+      revision: sourceRevision,
+    });
+    const targetImage = renderTemplateSafe(this.dockerConfig.targetTemplate, {
+      ...this.dockerConfig,
+      version,
+    });
+
+    this.logger.debug(`Copying image from ${sourceImage} to ${targetImage}...`);
+    return spawnProcess(
+      DOCKER_BIN,
+      ['buildx', 'imagetools', 'create', '--tag', targetImage, sourceImage],
+      {},
+      { showStdout: true }
+    );
+  }
+
   /**
    * Pushes a source image to Docker Hub
    *
@@ -132,8 +164,14 @@ export class DockerTarget extends BaseTarget {
    */
   public async publish(version: string, revision: string): Promise<any> {
     await this.login();
-    await this.pull(revision);
-    await this.push(revision, version);
+
+    if (await this.hasBuildKit()) {
+      await this.copy(revision, version);
+    } else {
+      // Fall back to slow/old pull and push method.
+      await this.pull(revision);
+      await this.push(revision, version);
+    }
 
     this.logger.info('Docker release complete');
   }