Skip to content
Merged
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
14,267 changes: 9,808 additions & 4,459 deletions .pnp.cjs

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
5 changes: 1 addition & 4 deletions packages/dashmate/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,11 @@ Distribution package for Dash Masternode installation

### Dependencies

* [Docker](https://docs.docker.com/engine/installation/) (v18.06.0+)
* [Docker Compose](https://docs.docker.com/compose/install/) (v1.25.0+)
* [Docker](https://docs.docker.com/engine/installation/) (v20.10+)
* [Node.js](https://nodejs.org/en/download/) (v16.0+, NPM v8.0+)

For Linux installations you may optionally wish to follow the [post-installation steps](https://docs.docker.com/engine/install/linux-postinstall/) to manage Docker as a non-root user, otherwise you will have to run CLI and Docker commands with `sudo`.

**Note that Docker Compose v2 is not yet supported. Docker Desktop will automatically enable Docker Compose v2 under Windows and macOS, please go to "Settings -> General -> Use Docker Compose V2" and disable the checkbox to use Dashmate.**

### Distribution package

Use NPM to install dashmate globally in your system:
Expand Down
2 changes: 1 addition & 1 deletion packages/dashmate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"@dashevo/dashcore-lib": "~0.19.38",
"@dashevo/dashd-rpc": "^2.3.1",
"@dashevo/dashpay-contract": "workspace:~",
"@dashevo/docker-compose": "^0.24.0",
"@dashevo/dpns-contract": "workspace:~",
"@dashevo/dpp": "workspace:~",
"@dashevo/feature-flags-contract": "workspace:~",
Expand All @@ -62,7 +63,6 @@
"bls-signatures": "^0.2.5",
"chalk": "^4.1.0",
"dash": "workspace:~",
"docker-compose": "0.23.3",
"dockerode": "^3.2.0",
"dot": "^1.1.3",
"dotenv": "^8.6.0",
Expand Down
6 changes: 5 additions & 1 deletion packages/dashmate/src/docker/DockerCompose.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');

const dockerCompose = require('docker-compose');
const dockerCompose = require('@dashevo/docker-compose');

const hasbin = require('hasbin');
const semver = require('semver');
Expand Down Expand Up @@ -260,6 +260,10 @@ class DockerCompose {
commandOptions,
}));
} catch (e) {
if (e.err && e.err.startsWith('no such service:')) {
Comment thread
pshenmic marked this conversation as resolved.
return [];
}

throw new DockerComposeError(e);
}

Expand Down
Loading