From 3255b7e32d1f7509ceaf47ef0f48e66f69810043 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Mon, 13 Jun 2022 12:50:13 +0400 Subject: [PATCH 1/5] fix: remove DOCKER_COMPOSE_V2 check --- packages/dashmate/src/docker/DockerCompose.js | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/packages/dashmate/src/docker/DockerCompose.js b/packages/dashmate/src/docker/DockerCompose.js index 53a400d33a8..57548bf2cde 100644 --- a/packages/dashmate/src/docker/DockerCompose.js +++ b/packages/dashmate/src/docker/DockerCompose.js @@ -378,21 +378,15 @@ class DockerCompose { } // Check docker compose - if (process.env.DOCKER_COMPOSE_V2) { - try { - await execAsync('docker compose'); - } catch (e) { - throw new Error('Docker Compose V2 is not installed'); - } - } else { - if (!hasbin.sync('docker-compose')) { - throw new Error('Docker Compose is not installed'); - } + try { + await execAsync('docker compose'); + } catch (e) { + throw new Error('Docker Compose V2 is not available in your system'); + } - const { out: version } = await dockerCompose.version(); - if (semver.lt(version.trim(), DockerCompose.DOCKER_COMPOSE_MIN_VERSION)) { - throw new Error(`Update Docker Compose to version ${DockerCompose.DOCKER_COMPOSE_MIN_VERSION} or higher`); - } + const { out: version } = await dockerCompose.version(); + if (semver.lt(version.trim(), DockerCompose.DOCKER_COMPOSE_MIN_VERSION)) { + throw new Error(`Update Docker Compose to version ${DockerCompose.DOCKER_COMPOSE_MIN_VERSION} or higher`); } } From 04d28beb0272f88bdf768542848f98d084c27e8a Mon Sep 17 00:00:00 2001 From: pshenmic Date: Mon, 13 Jun 2022 13:19:41 +0400 Subject: [PATCH 2/5] chore: bump docker compose min version --- packages/dashmate/src/docker/DockerCompose.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dashmate/src/docker/DockerCompose.js b/packages/dashmate/src/docker/DockerCompose.js index 9eab052e1ee..63a9df791c2 100644 --- a/packages/dashmate/src/docker/DockerCompose.js +++ b/packages/dashmate/src/docker/DockerCompose.js @@ -413,7 +413,7 @@ class DockerCompose { } } -DockerCompose.DOCKER_COMPOSE_MIN_VERSION = '1.25.0'; +DockerCompose.DOCKER_COMPOSE_MIN_VERSION = '2.0.0'; DockerCompose.DOCKER_MIN_VERSION = '20.10.0'; module.exports = DockerCompose; From b71596e7e08ae54009f9ca90893823aba3031b9b Mon Sep 17 00:00:00 2001 From: pshenmic Date: Mon, 13 Jun 2022 13:28:00 +0400 Subject: [PATCH 3/5] fix: removed check from up command --- packages/dashmate/src/docker/DockerCompose.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/dashmate/src/docker/DockerCompose.js b/packages/dashmate/src/docker/DockerCompose.js index 63a9df791c2..a7672f4baa0 100644 --- a/packages/dashmate/src/docker/DockerCompose.js +++ b/packages/dashmate/src/docker/DockerCompose.js @@ -109,14 +109,10 @@ class DockerCompose { await this.throwErrorIfNotInstalled(); try { - if (process.env.DOCKER_COMPOSE_V2) { - await execAsync( - 'docker compose up --no-build -d', - this.getOptions(envs), - ); - } else { - await dockerCompose.upAll(this.getOptions(envs)); - } + await execAsync( + 'docker compose up --no-build -d', + this.getOptions(envs), + ); } catch (e) { throw new DockerComposeError(e); } From 5b827a4b85e6306f580a4ac4b514660a33d3438f Mon Sep 17 00:00:00 2001 From: pshenmic Date: Tue, 14 Jun 2022 06:37:52 +0400 Subject: [PATCH 4/5] fix: refactor to upAll --- packages/dashmate/src/docker/DockerCompose.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/dashmate/src/docker/DockerCompose.js b/packages/dashmate/src/docker/DockerCompose.js index a7672f4baa0..5cb8034de47 100644 --- a/packages/dashmate/src/docker/DockerCompose.js +++ b/packages/dashmate/src/docker/DockerCompose.js @@ -109,10 +109,9 @@ class DockerCompose { await this.throwErrorIfNotInstalled(); try { - await execAsync( - 'docker compose up --no-build -d', - this.getOptions(envs), - ); + await dockerCompose.upAll({ + ...this.getOptions(envs), + }); } catch (e) { throw new DockerComposeError(e); } From 900ea37214d03ce8ffd69521952e53372bdf5b06 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Tue, 14 Jun 2022 12:42:48 +0400 Subject: [PATCH 5/5] chore: update some docs --- README.md | 1 - packages/dashmate/README.md | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a167eadcc2d..c866b695796 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,6 @@ this repository may be used on the following networks: - Install prerequisites: - [node.js](https://nodejs.org/) v16.10.0+ - [docker](https://docs.docker.com/get-docker/) v20.10+ - - [docker-compose](https://docs.docker.com/compose/install/) v1.29.2+ - Run `corepack enable` to enable [corepack](https://nodejs.org/dist/latest/docs/api/corepack.html) and install yarn - Run `yarn setup` to install dependencies and configure and build all packages - Run `yarn start` to start the local dev environment built from the sources diff --git a/packages/dashmate/README.md b/packages/dashmate/README.md index 5b2d4f0db7c..0e872bb3cbd 100644 --- a/packages/dashmate/README.md +++ b/packages/dashmate/README.md @@ -376,10 +376,10 @@ If you want to use Docker Compose directly, you will need to pass a configuratio $ dashmate config envs --config=testnet --output-file .env.testnet ``` -Then specify the created dotenv file as an option for the `docker-compose` command: +Then specify the created dotenv file as an option for the `docker compose` command: ```bash -$ docker-compose --env-file=.env.testnet up -d +$ docker compose --env-file=.env.testnet up -d ``` ## Contributing