Add docker login when env vars are present

apptension · Sep 8, 2023 · 4055844 · 4055844
1 parent f27d38b
commit 4055844
Show file tree

Hide file tree

Showing 29 changed files with 68 additions and 33 deletions.
diff --git a/packages/infra/infra-shared/src/stacks/ci/ciBackend.ts b/packages/infra/infra-shared/src/stacks/ci/ciBackend.ts
@@ -93,7 +93,7 @@ export class BackendCiConfig extends ServiceCiConfig {
             commands: preBuildCommands,
           },
           build: {
-            commands: ['saas backend build'],
+            commands: ['pnpm saas backend build'],
           },
         },
       }),
@@ -172,7 +172,7 @@ export class BackendCiConfig extends ServiceCiConfig {
               PnpmWorkspaceFilters.BACKEND
             ),
           },
-          build: { commands: ['saas backend deploy api'] },
+          build: { commands: ['pnpm saas backend deploy api'] },
         },
         cache: {
           paths: [...this.defaultCachePaths],
@@ -235,7 +235,7 @@ export class BackendCiConfig extends ServiceCiConfig {
               PnpmWorkspaceFilters.BACKEND
             ),
           },
-          build: { commands: ['saas backend deploy migrations'] },
+          build: { commands: ['pnpm saas backend deploy migrations'] },
         },
         cache: {
           paths: [...this.defaultCachePaths],

diff --git a/packages/infra/infra-shared/src/stacks/ci/ciComponents.ts b/packages/infra/infra-shared/src/stacks/ci/ciComponents.ts
@@ -66,7 +66,7 @@ export class ComponentsCiConfig extends ServiceCiConfig {
               PnpmWorkspaceFilters.INFRA_SHARED
             ),
           },
-          build: { commands: ['saas infra deploy components'] },
+          build: { commands: ['pnpm saas infra deploy components'] },
         },
         cache: {
           paths: [...this.defaultCachePaths],

diff --git a/packages/infra/infra-shared/src/stacks/ci/ciDocs.ts b/packages/infra/infra-shared/src/stacks/ci/ciDocs.ts
@@ -81,7 +81,7 @@ export class DocsCiConfig extends ServiceCiConfig {
           pre_build: {
             commands: preBuildCommands,
           },
-          build: { commands: ['saas docs build'] },
+          build: { commands: ['pnpm saas docs build'] },
         },
         cache: {
           paths: this.defaultCachePaths,
@@ -154,7 +154,7 @@ export class DocsCiConfig extends ServiceCiConfig {
           pre_build: {
             commands: this.getWorkspaceSetupCommands(PnpmWorkspaceFilters.DOCS),
           },
-          build: { commands: ['saas docs deploy'] },
+          build: { commands: ['pnpm saas docs deploy'] },
         },
         cache: {
           paths: [...this.defaultCachePaths],

diff --git a/packages/infra/infra-shared/src/stacks/ci/ciServerless.ts b/packages/infra/infra-shared/src/stacks/ci/ciServerless.ts
@@ -94,9 +94,9 @@ export class ServerlessCiConfig extends ServiceCiConfig {
           },
           build: {
             commands: [
-              `saas workers lint`,
-              'saas emails build',
-              `saas workers test`,
+              `pnpm saas workers lint`,
+              'pnpm saas emails build',
+              `pnpm saas workers test`,
             ],
           },
         },
@@ -213,7 +213,7 @@ export class ServerlessCiConfig extends ServiceCiConfig {
           pre_build: {
             commands: preBuildCommands,
           },
-          build: { commands: [`saas workers deploy`] },
+          build: { commands: [`pnpm saas workers deploy`] },
         },
         cache: {
           paths: this.defaultCachePaths,

diff --git a/packages/infra/infra-shared/src/stacks/ci/ciWebApp.ts b/packages/infra/infra-shared/src/stacks/ci/ciWebApp.ts
@@ -86,9 +86,9 @@ export class WebappCiConfig extends ServiceCiConfig {
           },
           build: {
             commands: [
-              'saas webapp lint',
-              'saas webapp test --watchAll=false',
-              'saas webapp build',
+              'pnpm saas webapp lint',
+              'pnpm saas webapp test --watchAll=false',
+              'pnpm saas webapp build',
             ],
           },
         },
@@ -149,7 +149,7 @@ export class WebappCiConfig extends ServiceCiConfig {
               PnpmWorkspaceFilters.WEBAPP
             ),
           },
-          build: { commands: ['saas webapp deploy'] },
+          build: { commands: ['pnpm saas webapp deploy'] },
         },
         cache: {
           paths: [...this.defaultCachePaths],

diff --git a/packages/internal/cli/src/commands/backend/black.ts b/packages/internal/cli/src/commands/backend/black.ts
@@ -2,7 +2,7 @@ import { Command } from '@oclif/core';
 
 import { initConfig } from '../../config/init';
 import { runCommand } from '../../lib/runCommand';
-import { assertDockerIsRunning } from '../../lib/docker';
+import {assertDockerIsRunning, dockerHubLogin} from '../../lib/docker';
 
 export default class BackendBlack extends Command {
   static description = 'Run black inside backend docker container';
@@ -12,6 +12,7 @@ export default class BackendBlack extends Command {
   async run(): Promise<void> {
     await initConfig(this, { requireLocalEnvStage: true });
     await assertDockerIsRunning();
+    await dockerHubLogin();
 
     await runCommand('docker', [
       'compose',

diff --git a/packages/internal/cli/src/commands/backend/build-docs.ts b/packages/internal/cli/src/commands/backend/build-docs.ts
@@ -2,6 +2,7 @@ import { Command } from '@oclif/core';
 
 import { initConfig } from '../../config/init';
 import { runCommand } from '../../lib/runCommand';
+import {dockerHubLogin} from "../../lib/docker";
 
 export default class BackendBuild extends Command {
   static description = 'Build backend docs and put results into docs package';
@@ -10,6 +11,7 @@ export default class BackendBuild extends Command {
 
   async run(): Promise<void> {
     await initConfig(this, {});
+    await dockerHubLogin();
 
     await runCommand('pnpm', ['nx', 'run', 'backend:build-docs']);
   }

diff --git a/packages/internal/cli/src/commands/backend/build.ts b/packages/internal/cli/src/commands/backend/build.ts
@@ -3,6 +3,7 @@ import { color } from '@oclif/color';
 
 import { initConfig } from '../../config/init';
 import { runCommand } from '../../lib/runCommand';
+import {dockerHubLogin} from "../../lib/docker";
 
 export default class BackendBuild extends Command {
   static description = 'Build backend docker image and upload it to AWS ECR';
@@ -14,6 +15,7 @@ export default class BackendBuild extends Command {
       this,
       { requireAws: true }
     );
+    await dockerHubLogin();
 
     this.log(`Building backend:
   envStage: ${color.green(envStage)}

diff --git a/packages/internal/cli/src/commands/backend/makemigrations.ts b/packages/internal/cli/src/commands/backend/makemigrations.ts
@@ -2,7 +2,7 @@ import { Command } from '@oclif/core';
 
 import { initConfig } from '../../config/init';
 import { runCommand } from '../../lib/runCommand';
-import { assertDockerIsRunning } from '../../lib/docker';
+import {assertDockerIsRunning, dockerHubLogin} from '../../lib/docker';
 
 export default class BackendMakemigrations extends Command {
   static description =
@@ -14,6 +14,7 @@ export default class BackendMakemigrations extends Command {
   async run(): Promise<void> {
     await initConfig(this, { requireLocalEnvStage: true });
     await assertDockerIsRunning();
+    await dockerHubLogin();
 
     await runCommand('docker', [
       'compose',

diff --git a/packages/internal/cli/src/commands/backend/migrate.ts b/packages/internal/cli/src/commands/backend/migrate.ts
@@ -2,7 +2,7 @@ import { Command } from '@oclif/core';
 
 import { initConfig } from '../../config/init';
 import { runCommand } from '../../lib/runCommand';
-import { assertDockerIsRunning } from '../../lib/docker';
+import {assertDockerIsRunning, dockerHubLogin} from '../../lib/docker';
 
 export default class BackendMigrate extends Command {
   static description =
@@ -14,6 +14,7 @@ export default class BackendMigrate extends Command {
   async run(): Promise<void> {
     await initConfig(this, { requireLocalEnvStage: true });
     await assertDockerIsRunning();
+    await dockerHubLogin();
 
     await runCommand('docker', [
       'compose',

diff --git a/packages/internal/cli/src/commands/backend/ruff.ts b/packages/internal/cli/src/commands/backend/ruff.ts
@@ -2,7 +2,7 @@ import { Command } from '@oclif/core';
 
 import { initConfig } from '../../config/init';
 import { runCommand } from '../../lib/runCommand';
-import { assertDockerIsRunning } from '../../lib/docker';
+import {assertDockerIsRunning, dockerHubLogin} from '../../lib/docker';
 
 export default class BackendRuff extends Command {
   static description = 'Run ruff inside backend docker container';
@@ -12,6 +12,7 @@ export default class BackendRuff extends Command {
   async run(): Promise<void> {
     await initConfig(this, { requireLocalEnvStage: true });
     await assertDockerIsRunning();
+    await dockerHubLogin();
 
     await runCommand('docker', [
       'compose',

diff --git a/packages/internal/cli/src/commands/backend/secrets.ts b/packages/internal/cli/src/commands/backend/secrets.ts
@@ -2,7 +2,7 @@ import { Command } from '@oclif/core';
 import { color } from '@oclif/color';
 
 import { initConfig } from '../../config/init';
-import { assertDockerIsRunning } from '../../lib/docker';
+import {assertDockerIsRunning, dockerHubLogin} from '../../lib/docker';
 import { runSecretsEditor } from '../../lib/secretsEditor';
 
 export default class BackendSecrets extends Command {
@@ -17,6 +17,7 @@ export default class BackendSecrets extends Command {
       requireAws: true,
     });
     await assertDockerIsRunning();
+    await dockerHubLogin();
 
     this.log(`Settings secrets in AWS SSM Parameter store for:
   service: ${color.green('backend')}

diff --git a/packages/internal/cli/src/commands/backend/shell.ts b/packages/internal/cli/src/commands/backend/shell.ts
@@ -2,7 +2,7 @@ import { Command } from '@oclif/core';
 
 import { initConfig } from '../../config/init';
 import { runCommand } from '../../lib/runCommand';
-import { assertDockerIsRunning } from '../../lib/docker';
+import {assertDockerIsRunning, dockerHubLogin} from '../../lib/docker';
 
 export default class BackendShell extends Command {
   static description =
@@ -13,6 +13,7 @@ export default class BackendShell extends Command {
   async run(): Promise<void> {
     await initConfig(this, { requireLocalEnvStage: true });
     await assertDockerIsRunning();
+    await dockerHubLogin();
 
     await runCommand('docker', [
       'compose',

diff --git a/packages/internal/cli/src/commands/backend/stripe/sync.ts b/packages/internal/cli/src/commands/backend/stripe/sync.ts
@@ -2,7 +2,7 @@ import { Command } from '@oclif/core';
 
 import { initConfig } from '../../../config/init';
 import { runCommand } from '../../../lib/runCommand';
-import { assertDockerIsRunning } from '../../../lib/docker';
+import {assertDockerIsRunning, dockerHubLogin} from '../../../lib/docker';
 
 export default class BackendStripeSync extends Command {
   static description =
@@ -14,6 +14,7 @@ export default class BackendStripeSync extends Command {
   async run(): Promise<void> {
     await initConfig(this, { requireLocalEnvStage: true });
     await assertDockerIsRunning();
+    await dockerHubLogin();
 
     await runCommand('docker', [
       'compose',

diff --git a/packages/internal/cli/src/commands/backend/up.ts b/packages/internal/cli/src/commands/backend/up.ts
@@ -2,7 +2,7 @@ import { Command } from '@oclif/core';
 
 import { initConfig } from '../../config/init';
 import { runCommand } from '../../lib/runCommand';
-import { assertDockerIsRunning } from '../../lib/docker';
+import {assertDockerIsRunning, dockerHubLogin} from '../../lib/docker';
 
 export default class BackendUp extends Command {
   static description = 'Starts all backend services';
@@ -12,6 +12,7 @@ export default class BackendUp extends Command {
   async run(): Promise<void> {
     await initConfig(this, { requireLocalEnvStage: true });
     await assertDockerIsRunning();
+    await dockerHubLogin();
 
     await runCommand('pnpm', ['nx', 'run', 'core:docker-compose:up']);
   }

diff --git a/packages/internal/cli/src/commands/build.ts b/packages/internal/cli/src/commands/build.ts
@@ -2,6 +2,7 @@ import { Command, Flags } from '@oclif/core';
 
 import { initConfig } from '../config/init';
 import { runCommand } from '../lib/runCommand';
+import { dockerHubLogin } from '../lib/docker';
 
 export default class Build extends Command {
   static description = 'Build all deployable artifacts';
@@ -10,6 +11,7 @@ export default class Build extends Command {
 
   async run(): Promise<void> {
     await initConfig(this, { requireAws: true });
+    await dockerHubLogin();
 
     await runCommand('pnpm', ['nx', 'run', 'backend:build']);
     await runCommand('pnpm', ['nx', 'run', 'webapp:build']);

diff --git a/packages/internal/cli/src/commands/db/shell.ts b/packages/internal/cli/src/commands/db/shell.ts
@@ -2,7 +2,7 @@ import { Command } from '@oclif/core';
 
 import { initConfig } from '../../config/init';
 import { runCommand } from '../../lib/runCommand';
-import { assertDockerIsRunning } from '../../lib/docker';
+import {assertDockerIsRunning, dockerHubLogin} from '../../lib/docker';
 
 export default class DbShell extends Command {
   static description =
@@ -20,6 +20,7 @@ export default class DbShell extends Command {
     });
 
     await assertDockerIsRunning();
+    await dockerHubLogin();
 
     await runCommand('docker', ['compose', 'exec', 'db', 'psql'], {
       env: {

diff --git a/packages/internal/cli/src/commands/down.ts b/packages/internal/cli/src/commands/down.ts
@@ -2,7 +2,7 @@ import { Command } from '@oclif/core';
 
 import { initConfig } from '../config/init';
 import { runCommand } from '../lib/runCommand';
-import { assertDockerIsRunning } from '../lib/docker';
+import {assertDockerIsRunning, dockerHubLogin} from '../lib/docker';
 
 export default class Down extends Command {
   static description = 'Starts both backend and frontend';

diff --git a/packages/internal/cli/src/commands/up.ts b/packages/internal/cli/src/commands/up.ts
@@ -2,7 +2,7 @@ import { Command } from '@oclif/core';
 
 import { initConfig } from '../config/init';
 import { runCommand } from '../lib/runCommand';
-import { assertDockerIsRunning } from '../lib/docker';
+import {assertDockerIsRunning, dockerHubLogin} from '../lib/docker';
 
 export default class Up extends Command {
   static description = 'Starts both backend and frontend';
@@ -12,6 +12,7 @@ export default class Up extends Command {
   async run(): Promise<void> {
     await initConfig(this, { requireLocalEnvStage: true });
     await assertDockerIsRunning();
+    await dockerHubLogin();
 
     await runCommand('pnpm', ['nx', 'run', 'core:docker-compose:up']);
     await runCommand('pnpm', ['nx', 'run', 'webapp:start']);

diff --git a/packages/internal/cli/src/commands/webapp/secrets.ts b/packages/internal/cli/src/commands/webapp/secrets.ts
@@ -2,7 +2,7 @@ import { Command } from '@oclif/core';
 import { color } from '@oclif/color';
 
 import { initConfig } from '../../config/init';
-import { assertDockerIsRunning } from '../../lib/docker';
+import {assertDockerIsRunning, dockerHubLogin} from '../../lib/docker';
 import { runSecretsEditor } from '../../lib/secretsEditor';
 
 export default class WebappSecrets extends Command {
@@ -17,6 +17,7 @@ export default class WebappSecrets extends Command {
       requireAws: true,
     });
     await assertDockerIsRunning();
+    await dockerHubLogin();
 
     this.log(`Settings secrets in AWS SSM Parameter store for:
   service: ${color.green('webapp')}

diff --git a/packages/internal/cli/src/commands/workers/black.ts b/packages/internal/cli/src/commands/workers/black.ts
@@ -2,7 +2,7 @@ import { Command } from '@oclif/core';
 
 import { initConfig } from '../../config/init';
 import { runCommand } from '../../lib/runCommand';
-import { assertDockerIsRunning } from '../../lib/docker';
+import {assertDockerIsRunning, dockerHubLogin} from '../../lib/docker';
 
 export default class WorkersBlack extends Command {
   static description = 'Runs black inside workers docker container';
@@ -12,6 +12,7 @@ export default class WorkersBlack extends Command {
   async run(): Promise<void> {
     await initConfig(this, {});
     await assertDockerIsRunning();
+    await dockerHubLogin();
 
     await runCommand('docker', [
       'compose',

diff --git a/packages/internal/cli/src/commands/workers/build.ts b/packages/internal/cli/src/commands/workers/build.ts
@@ -3,6 +3,7 @@ import { Command, Flags } from '@oclif/core';
 import { initConfig } from '../../config/init';
 import { runCommand } from '../../lib/runCommand';
 import { color } from '@oclif/color';
+import {dockerHubLogin} from "../../lib/docker";
 
 export default class WorkersBuild extends Command {
   static description = 'Build workers artifact ready to be deployed to AWS';
@@ -14,6 +15,7 @@ export default class WorkersBuild extends Command {
       this,
       { requireAws: true }
     );
+    await dockerHubLogin();
 
     this.log(`Deploying backend:
   envStage: ${color.green(envStage)}

diff --git a/packages/internal/cli/src/commands/workers/deploy.ts b/packages/internal/cli/src/commands/workers/deploy.ts
@@ -1,8 +1,9 @@
 import { Command, Flags } from '@oclif/core';
+import { color } from '@oclif/color';
 
 import { initConfig } from '../../config/init';
 import { runCommand } from '../../lib/runCommand';
-import { color } from '@oclif/color';
+import { dockerHubLogin } from '../../lib/docker';
 
 export default class WorkersDeploy extends Command {
   static description = 'Deploys workers to AWS using previously built artifact';
@@ -24,6 +25,7 @@ export default class WorkersDeploy extends Command {
       this,
       { requireAws: true }
     );
+    await dockerHubLogin();
 
     this.log(`Deploying backend:
   envStage: ${color.green(envStage)}