Skip to content

Commit

Permalink
Fix docker-compose error not being object (#248)
Browse files Browse the repository at this point in the history
  • Loading branch information
cristianrgreco authored Jul 25, 2021
1 parent 7c83f8c commit 8e6de86
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions src/docker-compose/functions/docker-compose-down.ts
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
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
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);
}
};

0 comments on commit 8e6de86

Please sign in to comment.