heroku 9.2.0-beta.0 → 9.2.0

package/lib/commands/container/push.js

@@ -60,7 +60,13 @@ class Push extends command_1.Command {
                 else {
                     core_1.ux.styledHeader(`Building ${job.name} (${job.dockerfile})`);
                 }
-                await DockerHelper.buildImage(job.dockerfile, job.resource, buildArgs, contextPath);
+                await DockerHelper.buildImage({
+                    dockerfile: job.dockerfile,
+                    resource: job.resource,
+                    buildArgs,
+                    path: contextPath,
+                    arch: this.config.arch,
+                });
             }
         }
         catch (error) {

package/lib/lib/container/docker_helper.d.ts

@@ -19,6 +19,14 @@ export declare type groupedDockerJobs = {
 export declare const getJobs: (resourceRoot: string, dockerfiles: string[]) => groupedDockerJobs;
 export declare const filterByProcessType: (jobs: groupedDockerJobs, processTypes: string[]) => groupedDockerJobs;
 export declare const chooseJobs: (jobs: groupedDockerJobs) => Promise<dockerJob[]>;
-export declare const buildImage: (dockerfile: string, resource: string, buildArgs: string[], path?: string) => Promise<string>;
+declare type BuildImageParams = {
+    dockerfile: string;
+    resource: string;
+    buildArgs: string[];
+    path?: string;
+    arch?: string;
+};
+export declare const buildImage: ({ dockerfile, resource, buildArgs, path, arch }: BuildImageParams) => Promise<string>;
 export declare const pushImage: (resource: string) => Promise<string>;
 export declare const runImage: (resource: string, command: string, port: number) => Promise<string>;
+export {};

package/lib/lib/container/docker_helper.js

@@ -7,6 +7,7 @@ const glob = require("glob");
 const Path = require("path");
 const inquirer = require("inquirer");
 const os = require("os");
+const core_1 = require("@oclif/core");
 const DOCKERFILE_REGEX = /\bDockerfile(.\w*)?$/;
 const cmd = async function (cmd, args, options = {}) {
     (0, debug_1.debug)(cmd, args);
@@ -114,6 +115,10 @@ const chooseJobs = async function (jobs) {
     for (const processType in jobs) {
         if (Object.prototype.hasOwnProperty.call(jobs, processType)) {
             const group = jobs[processType];
+            if (group === undefined) {
+                core_1.ux.warn(`Dockerfile.${processType} not found`);
+                continue;
+            }
             if (group.length > 1) {
                 const prompt = [{
                         type: 'list',
@@ -135,9 +140,13 @@ const chooseJobs = async function (jobs) {
     return chosenJobs;
 };
 exports.chooseJobs = chooseJobs;
-const buildImage = async function (dockerfile, resource, buildArgs, path) {
+const buildImage = async function ({ dockerfile, resource, buildArgs, path, arch }) {
     const cwd = path || Path.dirname(dockerfile);
-    const args = ['build', '-f', dockerfile, '-t', resource, '--platform', 'linux/amd64'];
+    const args = ['build', '-f', dockerfile, '-t', resource];
+    // Older Docker versions don't allow for this flag, but we are
+    // adding it here when necessary to allow for pushing a docker build from m1/m2 Macs.
+    if (arch === 'arm64')
+        args.push('--platform', 'linux/amd64');
     for (const element of buildArgs) {
         if (element.length > 0) {
             args.push('--build-arg', element);