Allow app.build_stack to be container for ensureContainerStack

packages/cli/src/lib/container/helpers.ts

@@ -13,11 +13,15 @@ const stackLabelMap: { [key: string]: string} = {
  * @returns {null} null
  */
 export function ensureContainerStack(app: Heroku.App, cmd: string): void {
-  if (app.stack?.name !== 'container') {
-    const appLabel = (app.stack?.name && stackLabelMap[app.stack.name]) || app.stack?.name
+  const buildStack = app.build_stack?.name
+  const appStack = app.stack?.name
+  const allowedStack = 'container'
+
+  // either can be container stack and are allowed
+  if (buildStack !== allowedStack && appStack !== allowedStack) {
     let message = 'This command is for Docker apps only.'
     if (['push', 'release'].includes(cmd)) {
-      message += ` Run ${color.cyan('git push heroku main')} to deploy your ${color.cyan(app.name)} ${color.cyan(appLabel)} app instead.`
+      message += ` Switch stacks by running ${color.cmd('heroku stack:set container')}. Or, to deploy ${color.app(app.name)} with ${color.yellow(appStack)}, run ${color.cmd('git push heroku main')} instead.`
     }
 
     ux.error(message, {exit: 1})

packages/cli/test/unit/commands/container/push.unit.test.ts

@@ -40,11 +40,40 @@ describe('container push', function () {
         error = error_
       })
       const {message, oclif} = error as unknown as CLIError
-      expect(message).to.equal(`This command is for Docker apps only. Run ${color.cyan('git push heroku main')} to deploy your ${color.cyan('testapp')} ${color.cyan('heroku-24')} app instead.`)
+      expect(message).to.equal(`This command is for Docker apps only. Switch stacks by running ${color.cmd('heroku stack:set container')}. Or, to deploy ${color.app('testapp')} with ${color.yellow('heroku-24')}, run ${color.cmd('git push heroku main')} instead.`)
       expect(oclif.exit).to.equal(1)
     })
   })
 
+  context('when the app build_stack is container', function () {
+    beforeEach(function () {
+      api
+        .get('/apps/testapp')
+        .reply(200, {name: 'testapp', stack: {name: 'heroku-22'}, build_stack: {name: 'container'}})
+    })
+
+    it('allows push to the docker registry', async function () {
+      const dockerfiles = sandbox.stub(DockerHelper, 'getDockerfiles')
+        .returns(['/path/to/Dockerfile'])
+      const build = sandbox.stub(DockerHelper, 'buildImage')
+        .withArgs('/path/to/Dockerfile', 'registry.heroku.com/testapp/web', [])
+      const push = sandbox.stub(DockerHelper, 'pushImage')
+        .withArgs('registry.heroku.com/testapp/web')
+
+      await runCommand(Cmd, [
+        '--app',
+        'testapp',
+        'web',
+      ])
+
+      expect(stdout.output).to.contain('Building web (/path/to/Dockerfile)')
+      expect(stdout.output).to.contain('Pushing web (/path/to/Dockerfile)')
+      sandbox.assert.calledOnce(dockerfiles)
+      sandbox.assert.calledOnce(build)
+      sandbox.assert.calledOnce(push)
+    })
+  })
+
   context('when the app is a container app', function () {
     beforeEach(function () {
       api

packages/cli/test/unit/commands/container/release.unit.test.ts

@@ -50,7 +50,7 @@ describe('container release', function () {
     })
 
     const {message, oclif} = error as unknown as CLIError
-    expect(message).to.equal(`This command is for Docker apps only. Run ${color.cyan('git push heroku main')} to deploy your ${color.cyan('testapp')} ${color.cyan('heroku-24')} app instead.`)
+    expect(message).to.equal(`This command is for Docker apps only. Switch stacks by running ${color.cmd('heroku stack:set container')}. Or, to deploy ${color.app('testapp')} with ${color.yellow('heroku-24')}, run ${color.cmd('git push heroku main')} instead.`)
     expect(oclif.exit).to.equal(1)
   })