diff --git a/.pnp.cjs b/.pnp.cjs index 35a2883f892..b0bd0254daf 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -7692,6 +7692,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["glob", "npm:7.2.0"],\ ["globby", "npm:11.1.0"],\ ["hasbin", "npm:1.2.3"],\ + ["is-wsl", "npm:2.2.0"],\ ["jayson", "npm:3.6.5"],\ ["listr2", "virtual:880cda903c2a2be387819a3f857d21494004437a03c92969b9853f7bdeebdfed08d417e68364ee9e158338603a6d78d690c457a55ab11e56398bc10f0ad232fc#npm:3.5.0"],\ ["lodash", "npm:4.17.21"],\ diff --git a/packages/dashmate/docker-compose.yml b/packages/dashmate/docker-compose.yml index 45c477448a6..70ee60f0486 100644 --- a/packages/dashmate/docker-compose.yml +++ b/packages/dashmate/docker-compose.yml @@ -13,6 +13,11 @@ services: command: - dashd stop_grace_period: 30s + environment: + # Solving issue under WSL when after restart container volume is not being mounted properly + # https://github.com/docker/for-win/issues/4812 + # Following fix forces container recreation + - WSL2_FIX=${WSL2_FIX:-0} volumes: core_data: diff --git a/packages/dashmate/package.json b/packages/dashmate/package.json index 9db2d9662e0..1a36c0fcfa5 100644 --- a/packages/dashmate/package.json +++ b/packages/dashmate/package.json @@ -72,6 +72,7 @@ "enquirer": "^2.3.6", "glob": "^7.1.6", "hasbin": "^1.2.3", + "is-wsl": "2.2.0", "jayson": "^3.3.4", "listr2": "3.5.0", "lodash": "^4.17.21", diff --git a/packages/dashmate/src/docker/DockerCompose.js b/packages/dashmate/src/docker/DockerCompose.js index 3ab86e3649b..ad2ceb02574 100644 --- a/packages/dashmate/src/docker/DockerCompose.js +++ b/packages/dashmate/src/docker/DockerCompose.js @@ -1,6 +1,8 @@ const path = require('path'); const { Observable } = require('rxjs'); +const isWsl = require('is-wsl'); + const dockerCompose = require('@dashevo/docker-compose'); const hasbin = require('hasbin'); @@ -401,6 +403,13 @@ class DockerCompose { DASHMATE_HOME_DIR: HOME_DIR_PATH, }; + if (isWsl) { + // Solving issue under WSL when after restart container volume is not being mounted properly + // https://github.com/docker/for-win/issues/4812 + // Following fix forces container recreation + env.WSL2_FIX = (new Date()).getTime(); + } + return { cwd: path.join(__dirname, '..', '..'), env, diff --git a/yarn.lock b/yarn.lock index f1fcf493f0c..8259ff2e107 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5750,6 +5750,7 @@ __metadata: glob: ^7.1.6 globby: ^11 hasbin: ^1.2.3 + is-wsl: 2.2.0 jayson: ^3.3.4 listr2: 3.5.0 lodash: ^4.17.21 @@ -8567,7 +8568,7 @@ fsevents@~2.3.2: languageName: node linkType: hard -"is-wsl@npm:^2.2.0": +"is-wsl@npm:2.2.0, is-wsl@npm:^2.2.0": version: 2.2.0 resolution: "is-wsl@npm:2.2.0" dependencies: