Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 15 additions & 8 deletions packages/dashmate/src/docker/DockerCompose.js
Original file line number Diff line number Diff line change
Expand Up @@ -362,21 +362,28 @@ class DockerCompose {

const dockerComposeInstallLink = 'https://docs.docker.com/compose/install/';
const dockerInstallLink = 'https://docs.docker.com/engine/install/';
const dockerPostInstallLinuxLink = 'https://docs.docker.com/engine/install/linux-postinstall/';
const dockerContextLink = 'https://docs.docker.com/engine/context/working-with-contexts/';

// Check docker
if (!hasbin.sync('docker')) {
throw new Error(`Docker is not installed. Please follow instructions ${dockerInstallLink}`);
}

const dockerVersion = await new Promise((resolve, reject) => {
this.docker.version((err, data) => {
if (err) {
return reject(err);
}

return resolve(data.Version);
let dockerVersion;
try {
dockerVersion = await new Promise((resolve, reject) => {
this.docker.version((err, data) => {
if (err) {
return reject(err);
}

return resolve(data.Version);
});
});
});
} catch (e) {
throw new Error(`Can't connect to Docker Engine: ${e.message}.\n\nPossible reasons:\n1. Docker is not started\n2. Permission issues ${dockerPostInstallLinuxLink}\n3. Wrong context ${dockerContextLink}`);
}

if (semver.lt(dockerVersion.trim(), DockerCompose.DOCKER_MIN_VERSION)) {
throw new Error(`Update Docker to version ${DockerCompose.DOCKER_MIN_VERSION} or higher. Please follow instructions ${dockerInstallLink}`);
Expand Down
2 changes: 1 addition & 1 deletion packages/dashmate/src/status/scopes/masternode.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ function getMasternodeScopeFactory(dockerCompose, createRpcClient, getConnection

masternode.proTxHash = proTxHash;
masternode.status = status;
masternode.state = state;
masternode.state = state || MasternodeStateEnum.UNKNOWN;

if (state === MasternodeStateEnum.READY) {
const { dmnState } = masternodeStatus.result;
Expand Down