fix(wb): make 'docker build' refer to WB_ENV

WillBooster · Oct 8, 2023 · a85e349 · a85e349
1 parent b41cd8b
commit a85e349
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/packages/wb/src/commands/test.ts b/packages/wb/src/commands/test.ts
@@ -82,7 +82,7 @@ export async function test(argv: ArgumentsCamelCase<InferredOptionTypes<typeof b
     // Check playwright installation because --ci includes --e2e implicitly
     if (argv.e2e !== 'none' && (await e2eTestsExistPromise)) {
       if (project.hasDockerfile) {
-        await runWithSpawn(`${scripts.buildDocker(argv, 'test')}`, argv);
+        await runWithSpawn(`${scripts.buildDocker()}`, argv);
       }
       const options = project.hasDockerfile
         ? {
@@ -158,7 +158,7 @@ async function testOnDocker(
   scripts: BaseExecutionScripts,
   prefix = ''
 ): Promise<void> {
-  await runWithSpawn(`${scripts.buildDocker(argv, 'test')}`, argv);
+  await runWithSpawn(`${scripts.buildDocker()}`, argv);
   process.exitCode = await runWithSpawn(
     `${prefix}${scripts.testE2E(argv, {
       startCommand: dockerScripts.stopAndStart(true),

diff --git a/packages/wb/src/scripts/dockerScripts.ts b/packages/wb/src/scripts/dockerScripts.ts
@@ -8,7 +8,7 @@ import { spawnSyncOnExit } from '../utils.js';
  * Note that `YARN zzz` is replaced with `yarn zzz` or `node_modules/.bin/zzz`.
  */
 class DockerScripts {
-  buildDevImage(wbEnv = 'local'): string {
+  buildDevImage(): string {
     // e.g. coding-booster uses `"docker/build/prepare": "touch drill-users.csv",`
     const prefix = project.dockerPackageJson.scripts?.['docker/build/prepare']
       ? 'yarn run docker/build/prepare && '
@@ -17,7 +17,7 @@ class DockerScripts {
     && ${prefix}YARN wb optimizeForDockerBuild --outside
     && YARN wb retry -- docker build -t ${project.nameWithoutNamespace}
         --build-arg ARCH=$([ $(uname -m) = 'arm64' ] && echo arm64 || echo amd64)
-        --build-arg WB_ENV=${wbEnv}
+        --build-arg WB_ENV=${process.env.WB_ENV}
         --build-arg WB_VERSION=dev .`;
   }
   stopAndStart(unbuffer = false, additionalOptions = '', additionalArgs = ''): string {

diff --git a/packages/wb/src/scripts/execution/baseExecutionScripts.ts b/packages/wb/src/scripts/execution/baseExecutionScripts.ts
@@ -18,16 +18,16 @@ export interface TestE2EOptions extends TestE2EDevOptions {
 export abstract class BaseExecutionScripts {
   protected constructor(private readonly defaultPort = 3000) {}
 
-  buildDocker(argv: ScriptArgv, wbEnv = 'local'): string {
-    return dockerScripts.buildDevImage(wbEnv);
+  buildDocker(): string {
+    return dockerScripts.buildDevImage();
   }
 
   abstract start(argv: ScriptArgv): string;
 
   abstract startProduction(argv: ScriptArgv, port: number): string;
 
   startDocker(argv: ScriptArgv): string {
-    return `${this.buildDocker(argv)}
+    return `${this.buildDocker()}
       && YARN concurrently --raw --kill-others-on-fail
         "${dockerScripts.stopAndStart(false, argv.normalizedDockerArgsText ?? '', argv.normalizedArgsText ?? '')}"
         "${this.waitAndOpenApp(argv, 8080)}"`;

diff --git a/packages/wb/src/scripts/execution/httpServerScripts.ts b/packages/wb/src/scripts/execution/httpServerScripts.ts
@@ -19,7 +19,7 @@ class HttpServerScripts extends BaseExecutionScripts {
   }
 
   override startDocker(argv: ScriptArgv): string {
-    return `${this.buildDocker(argv)} && ${dockerScripts.stopAndStart(
+    return `${this.buildDocker()} && ${dockerScripts.stopAndStart(
       false,
       argv.normalizedDockerArgsText ?? '',
       argv.normalizedArgsText ?? ''

diff --git a/packages/wb/src/scripts/execution/plainAppScripts.ts b/packages/wb/src/scripts/execution/plainAppScripts.ts
@@ -18,7 +18,7 @@ class PlainAppScripts extends BaseExecutionScripts {
   }
 
   override startDocker(argv: ScriptArgv): string {
-    return `${this.buildDocker(argv)} && ${dockerScripts.stopAndStart(
+    return `${this.buildDocker()} && ${dockerScripts.stopAndStart(
       false,
       argv.normalizedDockerArgsText ?? '',
       argv.normalizedArgsText ?? ''