Skip to content

Commit af52741

Browse files
committed
Rename var
1 parent 26744e6 commit af52741

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

packages/cli-v3/src/deploy/buildImage.ts

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -427,11 +427,12 @@ async function localBuildImage(options: SelfHostedBuildImageOptions): Promise<Bu
427427

428428
const errors: string[] = [];
429429

430-
let registryHost: string | undefined;
430+
let cloudRegistryHost: string | undefined;
431431
if (push && options.authenticateToRegistry) {
432-
registryHost = process.env.TRIGGER_DOCKER_REGISTRY ?? extractRegistryHostFromImageTag(imageTag);
432+
cloudRegistryHost =
433+
process.env.TRIGGER_DOCKER_REGISTRY ?? extractRegistryHostFromImageTag(imageTag);
433434

434-
if (!registryHost) {
435+
if (!cloudRegistryHost) {
435436
return {
436437
ok: false as const,
437438
error: "Failed to extract registry host from image tag",
@@ -451,11 +452,11 @@ async function localBuildImage(options: SelfHostedBuildImageOptions): Promise<Bu
451452
};
452453
}
453454

454-
logger.debug(`Logging in to docker registry: ${registryHost}`);
455+
logger.debug(`Logging in to docker registry: ${cloudRegistryHost}`);
455456

456457
const loginProcess = x(
457458
"docker",
458-
["login", "--username", credentials.username, "--password-stdin", registryHost],
459+
["login", "--username", credentials.username, "--password-stdin", cloudRegistryHost],
459460
{
460461
nodeOptions: {
461462
cwd: options.cwd,
@@ -474,12 +475,12 @@ async function localBuildImage(options: SelfHostedBuildImageOptions): Promise<Bu
474475
if (loginProcess.exitCode !== 0) {
475476
return {
476477
ok: false as const,
477-
error: `Failed to login to registry: ${registryHost}`,
478+
error: `Failed to login to registry: ${cloudRegistryHost}`,
478479
logs: extractLogs(errors),
479480
};
480481
}
481482

482-
options.onLog?.(`Successfully logged in to ${registryHost}`);
483+
options.onLog?.(`Successfully logged in to ${cloudRegistryHost}`);
483484
}
484485

485486
const args = [
@@ -541,9 +542,9 @@ async function localBuildImage(options: SelfHostedBuildImageOptions): Promise<Bu
541542
}
542543

543544
if (buildProcess.exitCode !== 0) {
544-
if (registryHost) {
545-
logger.debug(`Logging out from docker registry: ${registryHost}`);
546-
await x("docker", ["logout", registryHost]);
545+
if (cloudRegistryHost) {
546+
logger.debug(`Logging out from docker registry: ${cloudRegistryHost}`);
547+
await x("docker", ["logout", cloudRegistryHost]);
547548
}
548549

549550
return {
@@ -591,9 +592,9 @@ async function localBuildImage(options: SelfHostedBuildImageOptions): Promise<Bu
591592
options.onLog?.(`Image size: ${(imageSizeBytes / (1024 * 1024)).toFixed(2)} MB`);
592593
}
593594

594-
if (registryHost) {
595-
logger.debug(`Logging out from docker registry: ${registryHost}`);
596-
await x("docker", ["logout", registryHost]);
595+
if (cloudRegistryHost) {
596+
logger.debug(`Logging out from docker registry: ${cloudRegistryHost}`);
597+
await x("docker", ["logout", cloudRegistryHost]);
597598
}
598599

599600
return {

0 commit comments

Comments
 (0)