@florianpat/lando-core 3.23.27-5florianPat.1 → 3.23.27-5florianPat.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1 -1
- package/index.js +1 -1
- package/lib/art.js +1 -1
- package/lib/daemon.js +3 -3
- package/package.json +5 -5
- package/plugins/networking/index.js +1 -1
- package/plugins/proxy/builders/_proxy.js +1 -1
- package/tasks/setup.js +1 -1
- package/utils/get-config-defaults.js +2 -1
- package/utils/get-docker-bin-path.js +2 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
|
|
2
2
|
|
|
3
|
-
## v3.23.27-5florianPat.
|
|
3
|
+
## v3.23.27-5florianPat.3 - [November 21, 2025](https://github.com/florianPat/lando-core/releases/tag/v3.23.27-5florianPat.3)
|
|
4
4
|
|
|
5
5
|
## v3.23.26 - [January 24, 2025](https://github.com/lando/core/releases/tag/v3.23.26)
|
|
6
6
|
|
package/index.js
CHANGED
|
@@ -61,7 +61,7 @@ module.exports = async lando => {
|
|
|
61
61
|
lando.events.on('pre-setup', 0, async () => await require('./hooks/lando-copy-v3-scripts')(lando));
|
|
62
62
|
|
|
63
63
|
// ensure we setup docker if needed
|
|
64
|
-
lando.events.once('pre-setup', async options => await require(`./hooks/lando-setup-build-engine-${
|
|
64
|
+
lando.events.once('pre-setup', async options => await require(`./hooks/lando-setup-build-engine-${platform}`)(lando, options));
|
|
65
65
|
|
|
66
66
|
// do some sepecial handling on wsl
|
|
67
67
|
lando.events.once('pre-setup', async options => await require('./hooks/lando-setup-create-ca-wsl')(lando, options));
|
package/lib/art.js
CHANGED
|
@@ -300,7 +300,7 @@ exports.newContent = (type = 'guide') => [
|
|
|
300
300
|
'',
|
|
301
301
|
].join(os.EOL);
|
|
302
302
|
|
|
303
|
-
exports.setupHeader = (bengine =
|
|
303
|
+
exports.setupHeader = (bengine = process.landoPlatform === 'linux' || process.platform === 'linux' ? 'Engine' : 'Desktop') => `
|
|
304
304
|
${chalk.magenta(niceFont('Lando Setup!', 'Small Slant'))}
|
|
305
305
|
|
|
306
306
|
${chalk.bold('lando setup')} is a hidden convenience command to help you satisify the
|
package/lib/daemon.js
CHANGED
|
@@ -28,9 +28,9 @@ const buildDockerCmd = (cmd, scriptsDir, dockerBin) => {
|
|
|
28
28
|
case 'darwin':
|
|
29
29
|
return ['open', MACOS_BASE];
|
|
30
30
|
case 'linux':
|
|
31
|
-
case 'wsl':
|
|
32
31
|
return [path.join(scriptsDir, `docker-engine-${cmd}.sh`)];
|
|
33
32
|
case 'win32':
|
|
33
|
+
case 'wsl':
|
|
34
34
|
return ['powershell.exe', '-ExecutionPolicy', 'Bypass', '-File', `"${windowsStartScript}"`];
|
|
35
35
|
}
|
|
36
36
|
};
|
|
@@ -107,12 +107,12 @@ module.exports = class LandoDaemon {
|
|
|
107
107
|
await require('../utils/run-command')('open', [MACOS_BASE], {debug: this.debug});
|
|
108
108
|
break;
|
|
109
109
|
case 'linux':
|
|
110
|
-
case 'wsl':
|
|
111
110
|
const lscript = path.join(this.scriptsDir, 'docker-engine-start.sh');
|
|
112
111
|
if (password) await require('../utils/run-elevated')([lscript], {debug, password});
|
|
113
112
|
else await require('../utils/run-command')(lscript, {debug});
|
|
114
113
|
break;
|
|
115
114
|
case 'win32':
|
|
115
|
+
case 'wsl':
|
|
116
116
|
const wscript = path.join(this.scriptsDir, 'docker-desktop-start.ps1');
|
|
117
117
|
await require('../utils/run-powershell-script')(wscript, undefined, {debug: this.debug});
|
|
118
118
|
await require('delay')(2000);
|
|
@@ -226,10 +226,10 @@ module.exports = class LandoDaemon {
|
|
|
226
226
|
case 'darwin':
|
|
227
227
|
return getMacProp('CFBundleShortVersionString').then(version => ({...versions, desktop: version}));
|
|
228
228
|
case 'linux':
|
|
229
|
-
case 'wsl':
|
|
230
229
|
const cmd = [`"${this.docker}"`, 'version', '--format', '{{.Server.Version}}'];
|
|
231
230
|
return shell.sh(cmd).catch(() => '18.0.0').then(version => ({...versions, engine: version}));
|
|
232
231
|
case 'win32':
|
|
232
|
+
case 'wsl':
|
|
233
233
|
const componentsVersionFile = this.platform === 'win32'
|
|
234
234
|
? path.resolve(getDockerBinPath('win32'), '..', 'componentsVersion.json') : '/Docker/host/componentsVersion.json';
|
|
235
235
|
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@florianpat/lando-core",
|
|
3
3
|
"description": "The libraries that power all of Lando. Fork by flo for compose integration",
|
|
4
|
-
"version": "3.23.27-5florianPat.
|
|
4
|
+
"version": "3.23.27-5florianPat.3",
|
|
5
5
|
"author": "Florian Patruck @florianPat",
|
|
6
6
|
"license": "GPL-3.0",
|
|
7
7
|
"repository": "florianPat/lando-core",
|
|
@@ -249,9 +249,9 @@
|
|
|
249
249
|
"yargs-parser"
|
|
250
250
|
],
|
|
251
251
|
"dist": {
|
|
252
|
-
"integrity": "sha512-
|
|
253
|
-
"shasum": "
|
|
254
|
-
"filename": "florianpat-lando-core-3.23.27-5florianPat.
|
|
255
|
-
"unpackedSize":
|
|
252
|
+
"integrity": "sha512-N0edM9AlptxVSVlQPz9m43uEiL34/33zgJvijQsYKUpolhoD2O7+IvbOiAg3F+ZkFfbIQrBbYtu1rtA+pMGVRg==",
|
|
253
|
+
"shasum": "56f75bf811d1716bcf117e2a261f68692ae48a9e",
|
|
254
|
+
"filename": "florianpat-lando-core-3.23.27-5florianPat.3.tgz",
|
|
255
|
+
"unpackedSize": 60980617
|
|
256
256
|
}
|
|
257
257
|
}
|
|
@@ -76,7 +76,7 @@ module.exports = lando => {
|
|
|
76
76
|
if (lando.engine.dockerInstalled === false) return false;
|
|
77
77
|
|
|
78
78
|
// we also want to do an additional check on docker-destkop
|
|
79
|
-
if (
|
|
79
|
+
if (lando.config.os.landoPlatform !== 'linux' && !fs.existsSync(getDockerDesktopBin())) return false;
|
|
80
80
|
|
|
81
81
|
// otherwise attempt to sus things out
|
|
82
82
|
try {
|
package/tasks/setup.js
CHANGED
|
@@ -67,7 +67,7 @@ module.exports = lando => {
|
|
|
67
67
|
// get defaults from the lando config
|
|
68
68
|
const defaults = lando.config.setup;
|
|
69
69
|
// determine label for build engine
|
|
70
|
-
const buildEngine =
|
|
70
|
+
const buildEngine = process.landoPlatform === 'linux' || process.platform === 'linux' ? 'docker-engine' : 'docker-desktop';
|
|
71
71
|
// default options
|
|
72
72
|
const options = {
|
|
73
73
|
'build-engine': {
|
|
@@ -10,10 +10,11 @@ const getBuildEngineVersion = (platform = process.landoPlatform ?? process.platf
|
|
|
10
10
|
case 'darwin':
|
|
11
11
|
return '4.37.2';
|
|
12
12
|
case 'linux':
|
|
13
|
-
case 'wsl':
|
|
14
13
|
return '27.5.0';
|
|
15
14
|
case 'win32':
|
|
16
15
|
return '4.37.1';
|
|
16
|
+
case 'wsl':
|
|
17
|
+
return '4.37.1';
|
|
17
18
|
}
|
|
18
19
|
};
|
|
19
20
|
|
|
@@ -6,7 +6,6 @@ const path = require('path');
|
|
|
6
6
|
module.exports = (platform = process.landoPlatform ?? process.platform) => {
|
|
7
7
|
switch (platform) {
|
|
8
8
|
case 'linux':
|
|
9
|
-
case 'wsl':
|
|
10
9
|
return '/usr/share/lando/bin';
|
|
11
10
|
case 'win32':
|
|
12
11
|
const programFiles = process.env.ProgramW6432 || process.env.ProgramFiles;
|
|
@@ -18,6 +17,8 @@ module.exports = (platform = process.landoPlatform ?? process.platform) => {
|
|
|
18
17
|
} else {
|
|
19
18
|
return path.win32.join(programFiles + '\\Docker\\Docker\\resources\\bin');
|
|
20
19
|
}
|
|
20
|
+
case 'wsl':
|
|
21
|
+
return '/mnt/wsl/docker-desktop/cli-tools/usr/bin';
|
|
21
22
|
default:
|
|
22
23
|
return '/usr/bin';
|
|
23
24
|
}
|