Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix docker-compose error not being object #248

Merged
merged 1 commit into from
Jul 25, 2021
Merged

Fix docker-compose error not being object #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/docker-compose/functions/docker-compose-down.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ export const dockerComposeDown = async (options: DockerComposeOptions): Promise<
try {
await down({ ...defaultDockerComposeOptions(options), commandOptions: ["-v"] });
log.info(`Downed DockerCompose environment`);
} catch ({ err }) {
log.error(`Failed to down DockerCompose environment: ${err.trim()}`);
throw new Error(err.trim());
} catch (err) {
log.error(`Failed to down DockerCompose environment: ${err}`);
throw new Error(err);
}
};
6 changes: 3 additions & 3 deletions src/docker-compose/functions/docker-compose-stop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ export const dockerComposeStop = async (options: DockerComposeOptions): Promise<
try {
await stop(defaultDockerComposeOptions(options));
log.info(`Stopped DockerCompose environment`);
} catch ({ err }) {
log.error(`Failed to stop DockerCompose environment: ${err.trim()}`);
throw new Error(err.trim());
} catch (err) {
log.error(`Failed to stop DockerCompose environment: ${err}`);
throw new Error(err);
}
};
6 changes: 3 additions & 3 deletions src/docker-compose/functions/docker-compose-up.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ export const dockerComposeUp = async (options: DockerComposeOptions): Promise<vo
try {
await upAll(defaultDockerComposeOptions(options));
log.info(`Upped DockerCompose environment`);
} catch ({ err }) {
log.error(`Failed to up DockerCompose environment: ${err.trim()}`);
} catch (err) {
log.error(`Failed to up DockerCompose environment: ${err}`);

try {
await dockerComposeDown(options);
} catch {
log.warn(`Failed to down DockerCompose environment after failed up`);
}

throw new Error(err.trim());
throw new Error(err);
}
};