Skip to content

Commit f18ba26

Browse files
committed
Rename var
1 parent 75a0b5a commit f18ba26

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,
@@ -469,12 +470,12 @@ async function localBuildImage(options: SelfHostedBuildImageOptions): Promise<Bu
469470
if (loginProcess.exitCode !== 0) {
470471
return {
471472
ok: false as const,
472-
error: `Failed to login to registry: ${registryHost}`,
473+
error: `Failed to login to registry: ${cloudRegistryHost}`,
473474
logs: extractLogs(errors),
474475
};
475476
}
476477

477-
options.onLog?.(`Successfully logged in to ${registryHost}`);
478+
options.onLog?.(`Successfully logged in to ${cloudRegistryHost}`);
478479
}
479480

480481
const args = [
@@ -536,9 +537,9 @@ async function localBuildImage(options: SelfHostedBuildImageOptions): Promise<Bu
536537
}
537538

538539
if (buildProcess.exitCode !== 0) {
539-
if (registryHost) {
540-
logger.debug(`Logging out from docker registry: ${registryHost}`);
541-
await x("docker", ["logout", registryHost]);
540+
if (cloudRegistryHost) {
541+
logger.debug(`Logging out from docker registry: ${cloudRegistryHost}`);
542+
await x("docker", ["logout", cloudRegistryHost]);
542543
}
543544

544545
return {
@@ -586,9 +587,9 @@ async function localBuildImage(options: SelfHostedBuildImageOptions): Promise<Bu
586587
options.onLog?.(`Image size: ${(imageSizeBytes / (1024 * 1024)).toFixed(2)} MB`);
587588
}
588589

589-
if (registryHost) {
590-
logger.debug(`Logging out from docker registry: ${registryHost}`);
591-
await x("docker", ["logout", registryHost]);
590+
if (cloudRegistryHost) {
591+
logger.debug(`Logging out from docker registry: ${cloudRegistryHost}`);
592+
await x("docker", ["logout", cloudRegistryHost]);
592593
}
593594

594595
return {

0 commit comments

Comments
 (0)