@florianpat/lando-core 3.23.7-compose → 3.23.22-test2

package/CHANGELOG.md

@@ -1,6 +1,106 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
-## v3.23.7-compose - [November 17, 2024](https://github.com/florianPat/lando-core/releases/tag/v3.23.7-compose)
+## v3.23.22-test2 - [January 3, 2025](https://github.com/florianPat/lando-core/releases/tag/v3.23.22-test2)
+
+## v3.23.22 - [December 17, 2024](https://github.com/lando/core/releases/tag/v3.23.22)
+
+* Added ability to customize `networkLimit` [#245](https://github.com/lando/core/pull/245)
+* Fixed incorrect `-EncodedCommand` fallback detection for `powershell.exe` script execution [#297](https://github.com/lando/core/issues/297)
+
+## v3.23.21 - [December 14, 2024](https://github.com/lando/core/releases/tag/v3.23.21)
+
+* Fixed `powershell` scripts from failing when user cannot set `-ExecutionPolicy` to `Bypass` for `Process` scope [#297](https://github.com/lando/core/issues/297)
+* Fixed bug causing error when trying to add a user to a group that does not exist
+* Improved Docker Desktop installation detection to prevent unneeded launch attempts
+* Rebased some `wsl` helper utils on `spawn-sync-stringer` so they do not require `await`
+
+## v3.23.20 - [December 11, 2024](https://github.com/lando/core/releases/tag/v3.23.20)
+
+* Simplified `lando shellenv --add` `PATH` modification string to be more universal [#298](https://github.com/lando/core/issues/298)
+
+## v3.23.19 - [December 7, 2024](https://github.com/lando/core/releases/tag/v3.23.19)
+
+* Fixed bug causing auto setup to not correctly reset the orchestrator binary path
+* Improved `lando init` so that it can auto setup if needed
+
+## v3.23.18 - [December 6, 2024](https://github.com/lando/core/releases/tag/v3.23.18)
+
+* Improved release flow to better accommodate double barrelled development
+
+## v3.23.17 - [December 6, 2024](https://github.com/lando/core/releases/tag/v3.23.17)
+
+* Improved release flow to better accommodate double barrelled development
+
+## v3.23.16 - [December 5, 2024](https://github.com/lando/core/releases/tag/v3.23.16)
+
+* Fixed bug causing some `run-elevated` commands to fail on older Powershell versions
+* Removed `admin` requirement to install Lando Development CA on `win32` from `wsl`
+
+## v3.23.15 - [December 3, 2024](https://github.com/lando/core/releases/tag/v3.23.15)
+
+* Disabled `DOCKER_CLI_HINTS` on `lando`
+* Fixed bug causing some `lando exec` and tooling commands from not inheriting terminal columns and lines correctly [#277](https://github.com/lando/core/issues/277)
+* Fixed bug causing `lando setup` loop on `U Need Setup!`
+* Fixed bug causing failed update message when user needs to relaunch terminal
+* Improved `ux` for `autosetup`
+* Standardized non-TTY renderer selection to the `simple` renderer
+
+## v3.23.14 - [November 27, 2024](https://github.com/lando/core/releases/tag/v3.23.14)
+
+### New Features & Improvements
+
+* Added first class support to `lando setup` when run from `wsl` environments, see extended notes below
+* Improved `docker` auto start on `linux` to use `GUI` authentication if available
+* Improved messages and consistency between messages for `lando setup` tasks
+* Improved pending setup task sort order
+
+### Fixes
+
+* Fixed bug in `l337` component preventing some context files from being `COPY`ed correclty on `win32`
+* Fixed bug in `docker` launching causing it to not wait until `daemon` can accept connections
+* Fixed bug causing `deferred` tasks to show as `Running` instead of `Deferred`
+* Fixed bug causing case insenstive group membership matching to fail on `win32`
+* Fixed some failures when running in `circleci` by forcing `verbose` renderer
+
+### Internal
+
+* Introduced `process.landoPlatform` which is the same as `process.platform` but includes _our_ definition of `wsl` as a platform, see extended notes below
+
+### Extended Notes
+
+* Lando considers an environment a `wsl` environment only if `WSL_INTEROP` is on, otherwise it considers it a normal `linux` environment
+
+## v3.23.13 - [November 23, 2024](https://github.com/lando/core/releases/tag/v3.23.13)
+
+* Fixed bug causing metrics opt-out to not work in some situations [#277](https://github.com/lando/core/issues/277)
+* Updated default Docker Desktop version to `4.36.0`
+* Updated default Docker Compose version to `2.30.3`
+* Updated tested Docker Desktop range to `<=4.37`
+* Updated tested Docker Compose range to `<=2.31`
+
+## v3.23.12 - [November 21, 2024](https://github.com/lando/core/releases/tag/v3.23.12)
+
+* Fixed `lando shellenv` so it doesn't fail when `shell` profile is empty
+* Fixed `lando update` so it removes lingering `lando.exe`s in the update bin directory
+* Improved `lando shellenv` so that it always includes `~/.lando/bin` and includes it first
+* Improved messaging on `lando shellenv --add`
+* Improved messaging on `lando update` for `@lando/cli`
+
+## v3.23.11 - [November 20, 2024](https://github.com/lando/core/releases/tag/v3.23.11)
+
+* This release has no new content and is just to test the new modular release flow
+
+## v3.23.10 - [November 20, 2024](https://github.com/lando/core/releases/tag/v3.23.10)
+
+* This release has no new content and is just to test the new modular release flow
+
+## v3.23.9 - [November 20, 2024](https://github.com/lando/core/releases/tag/v3.23.9)
+
+* This release has no new content and is just to test the new modular release flow
+
+## v3.23.8 - [November 20, 2024](https://github.com/lando/core/releases/tag/v3.23.8)
+
+* This release has no new content and is just to test the new modular release flow
 
 ## v3.23.7 - [November 13, 2024](https://github.com/lando/core/releases/tag/v3.23.7)
 

package/bin/lando

@@ -12,6 +12,7 @@
 
 // set this first for all other downstream concerns
 const dns = require('dns');
+
 // Set DNS result order to IPv4 first
 dns.setDefaultResultOrder('ipv4first');
 
@@ -130,6 +131,7 @@ cli.checkPerms();
 
 // Lando cache stuffs
 process.lando = 'node';
+process.landoPlatform = require(`${COREBASE}/utils/is-wsl-interop`)() ? 'wsl' : process.platform;
 process.landoTaskCacheName = '_.tasks.cache';
 process.landoTaskCacheFile = path.join(cli.defaultConfig().userConfRoot, 'cache', process.landoTaskCacheName);
 process.landoAppCacheFile = !_.isEmpty(appConfig) ? appConfig.composeCache : undefined;

package/bin/lando.cmd

@@ -0,0 +1,3 @@
+@echo off
+
+node "%~dp0\lando" %*

package/builders/_lando.js

@@ -120,7 +120,8 @@ module.exports = {
       }
 
       // Add in some more dirz if it makes sense
-      if (home && _.get(_app, 'config.keys', true)) volumes.push(`${path.join(home, '.ssh')}:/user/.ssh:cached`);
+      if (home && _.get(_app, '_config.homeMount', true)) volumes.push(`${home}:/user:cached`);
+      else if (home && _.get(_app, 'config.keys', true)) volumes.push(`${path.join(home, '.ssh')}:/user/.ssh:cached`);
 
       // Handle cert refresh
       // @TODO: this might only be relevant to the proxy, if so let's move it there

package/components/l337-v4.js

@@ -310,8 +310,8 @@ class L337ServiceV4 extends EventEmitter {
           file.instructions = file.url ? ['ADD'] : ['COPY'];
           if (file.owner) file.instructions.push(`--chown=${file.owner}`);
           if (file.permissions) file.instructions.push(`--chmod=${file.permissions}`);
-          file.instructions.push(file.url ?? path.join('.', file.target));
-          file.instructions.push(process.platform === 'win32' ? file.target : path.resolve('/', file.target));
+          file.instructions.push(file.url ?? path.posix.resolve('/', file.target));
+          file.instructions.push(path.posix.resolve('/', file.target));
           file.instructions = file.instructions.join(' ');
         }
 

package/config.yml

@@ -13,18 +13,19 @@ dockerSupportedVersions:
   compose:
     satisfies: "1.x.x || 2.x.x"
     recommendUpdate: "<=2.24.6"
-    tested: "<=2.29.2"
+    tested: "<=2.30.99"
     link:
       linux: https://docs.docker.com/compose/install/#install-compose-on-linux-systems
       darwin: https://docs.docker.com/desktop/install/mac-install/
       win32: https://docs.docker.com/desktop/install/windows-install/
   desktop:
     satisfies: ">=4.0.0 <5"
-    tested: "<=4.35.0"
+    tested: "<=4.36.99"
     recommendUpdate: "<=4.34.0"
     link:
       darwin: https://docs.docker.com/desktop/install/mac-install/
       win32: https://docs.docker.com/desktop/install/windows-install/
+      wsl: https://docs.docker.com/desktop/install/windows-install/
   engine:
     satisfies: ">=18 <28"
     tested: "<=27.3.1"

package/hooks/lando-autostart-engine.js

@@ -9,38 +9,17 @@ module.exports = async lando => {
     const tasks = [{
       title: 'It seems Docker is not running, trying to start it up...',
       retry: {
-        tries: 25,
+        tries: 5,
         delay: 1000,
       },
       task: async (ctx, task) => {
-        // Prompt for sudo password if interactive and not Docker Desktop WSL2 integration
-        if (
-          process.platform === 'linux'
-          && lando.config.isInteractive
-          && !require('../utils/is-wsl-interop')(lando.engine.daemon.docker)
-        ) {
-          ctx.password = await task.prompt({
-            type: 'password',
-            name: 'password',
-            message: `Enter computer password for ${lando.config.username} to start docker`,
-            validate: async (input, state) => {
-              const options = {debug, ignoreReturnCode: true, password: input};
-              const response = await require('../utils/run-elevated')(['echo', 'hello there'], options);
-              if (response.code !== 0) return response.stderr;
-              return true;
-            },
-            onCancel() {
-              process.emit('SIGINT');
-            },
-          });
-        }
-
         try {
-          await lando.engine.daemon.up(false, ctx.password);
+          await lando.engine.daemon.up(false);
           await lando.shell.sh([`"${lando.engine.daemon.docker}"`, 'network', 'ls']);
         } catch (error) {
           ctx.errors.push(error);
-          throw error;
+          debug('%j', error);
+          throw new Error('Could not automatically start Docker. Please manually start it to continue.');
         }
       },
     }];

package/hooks/lando-run-setup.js

@@ -0,0 +1,58 @@
+'use strict';
+
+module.exports = async lando => {
+  // get the user setup defaults
+  const sopts = lando?.config?.setup;
+  // skip common plugins for now?
+  sopts.skipCommonPlugins = true;
+  // we dont need to show the summary here
+  sopts.yes = true;
+
+  // get our setup tasks
+  const tasks = await lando.getSetupStatus(sopts);
+
+  // do we need to install anything?
+  // @NOTE: is it right to include CANT INSTALL in here?
+  const notInstalled = tasks.filter(task => task.state !== 'INSTALLED');
+
+  // try to run setup if needed
+  if (notInstalled.length > 0) {
+    // should we show the header
+    const showHeader = notInstalled.find(task => {
+      if (task.id === 'setup-build-engine') return true;
+      if (task.restart) return true;
+      return false;
+    });
+
+    try {
+      // if not yes then show full setup banner?
+      if (showHeader && lando.cli) console.error(lando.cli.makeArt('runningSetup'));
+      // run setup
+      await lando.setup(sopts);
+      // reload plugins
+      await lando.reloadPlugins();
+      // reload needed config
+      const {orchestratorBin, orchestratorVersion, dockerBin, engineConfig} = require('../utils/build-config')(lando.config);
+      // reset needed config
+      lando.config = {...lando.config, orchestratorBin, orchestratorVersion, dockerBin, engineConfig};
+      // we need to explicitly reset this for some reason
+      lando.config.orchestratorBin = require('../utils/get-compose-x')(lando.config);
+
+      // reload engine
+      lando.engine = require('../utils/setup-engine')(
+        lando.config,
+        lando.cache,
+        lando.events,
+        lando.log,
+        lando.shell,
+        lando.config.instance,
+      );
+
+      // @TODO: rerun task?
+    } catch (error) {
+      if (lando.cli) console.error(lando.cli.makeArt('needsSetup'));
+      console.error(error);
+      throw Error('Critical dependencies could not be installed!');
+    }
+  }
+};

package/hooks/lando-setup-build-engine-darwin.js

@@ -1,6 +1,8 @@
 'use strict';
 
 const axios = require('../utils/get-axios')();
+const fs = require('fs');
+const getDockerDesktopBin = require('../utils/get-docker-desktop-x');
 const os = require('os');
 const path = require('path');
 const semver = require('semver');
@@ -8,6 +10,9 @@ const semver = require('semver');
 const {color} = require('listr2');
 
 const buildIds = {
+  '4.36.0': '175267',
+  '4.35.1': '173168',
+  '4.35.0': '172550',
   '4.34.3': '170107',
   '4.34.2': '167172',
   '4.34.0': '165256',
@@ -49,7 +54,7 @@ const getVersion = version => {
 /*
  * Helper to get docker compose v2 download url
  */
-const getEngineDownloadUrl = (id = '170107') => {
+const getEngineDownloadUrl = (id = '175267') => {
   const arch = process.arch === 'arm64' ? 'arm64' : 'amd64';
   return `https://desktop.docker.com/mac/main/${arch}/${id}/Docker.dmg`;
 };
@@ -92,21 +97,17 @@ module.exports = async (lando, options) => {
 
   // darwin install task
   options.tasks.push({
-    title: `Downloading build engine`,
+    title: 'Downloading build engine',
     id: 'setup-build-engine',
-    description: `@lando/build-engine (docker-desktop)`,
-    version: `docker-desktop ${install}`,
+    description: '@lando/build-engine (docker-desktop)',
+    version: `Docker Desktop ${install}`,
     hasRun: async () => {
-      // start by looking at the engine install status
-      // @NOTE: is this always defined?
-      if (lando.engine.dockerInstalled === false) return false;
+      // if we are missing any files we can check then terminate here
+      if (lando.engine.dockerInstalled === false || !fs.existsSync(getDockerDesktopBin())) return false;
 
       // if we get here let's make sure the engine is on
       try {
-        await lando.engine.daemon.up();
-        const BuildEngine = require('../components/docker-engine');
-        const bengine = new BuildEngine(lando.config.buildEngine, {debug});
-        await bengine.info();
+        await lando.engine.daemon.up({max: 1, backoff: 1000});
         return true;
       } catch (error) {
         lando.log.debug('docker install task has not run %j', error);
@@ -163,7 +164,7 @@ module.exports = async (lando, options) => {
         result.download = ctx.download;
 
         // finish up
-        task.title = 'Installed build engine to /Applications/Docker.app';
+        task.title = 'Installed build engine (Docker Desktop) to /Applications/Docker.app';
         return result;
       } catch (error) {
         throw error;

package/hooks/lando-setup-build-engine-linux.js

@@ -39,11 +39,20 @@ module.exports = async (lando, options) => {
     title: `Installing build engine`,
     id: 'setup-build-engine',
     description: `@lando/build-engine (docker-engine)`,
-    version: `docker-engine ${version}`,
+    version: `Docker Engine ${version}`,
     hasRun: async () => {
       // start by looking at the engine install status
       // @NOTE: is this always defined?
-      return lando.engine.dockerInstalled;
+      if (lando.engine.dockerInstalled === false) return false;
+
+      // if we get here let's make sure the engine is on
+      try {
+        await lando.engine.daemon.up({max: 1, backoff: 1000});
+        return true;
+      } catch (error) {
+        lando.log.debug('docker install task has not run %j', error);
+        return false;
+      }
     },
     canRun: async () => {
       // throw if we cannot resolve a semantic version to a buildid
@@ -93,7 +102,7 @@ module.exports = async (lando, options) => {
         result.download = ctx.download;
 
         // finish up
-        task.title = 'Installed build engine to /usr/bin/docker';
+        task.title = 'Installed build engine (Docker Engine) to /usr/bin/docker';
         return result;
       } catch (error) {
         throw error;
@@ -132,7 +141,8 @@ module.exports = async (lando, options) => {
       }
 
       try {
-        const command = ['usermod', '-aG', 'docker', lando.config.username];
+        const script = path.join(lando.config.userConfRoot, 'scripts', 'add-to-group.sh');
+        const command = [script, '--user', lando.config.username, '--group', 'docker'];
         const response = await require('../utils/run-elevated')(command, {debug, password: ctx.password});
         task.title = `Added ${lando.config.username} to docker group`;
         return response;

package/hooks/lando-setup-build-engine-win32.js

@@ -1,6 +1,8 @@
 'use strict';
 
 const axios = require('../utils/get-axios')();
+const fs = require('fs');
+const getDockerDesktopBin = require('../utils/get-docker-desktop-x');
 const os = require('os');
 const path = require('path');
 const semver = require('semver');
@@ -8,6 +10,9 @@ const {color} = require('listr2');
 const {nanoid} = require('nanoid');
 
 const buildIds = {
+  '4.36.0': '175267',
+  '4.35.1': '173168',
+  '4.35.0': '172550',
   '4.34.3': '170107',
   '4.34.2': '167172',
   '4.34.1': '166053',
@@ -50,7 +55,7 @@ const getVersion = version => {
 /*
  * Helper to get docker compose v2 download url
  */
-const getEngineDownloadUrl = (id = '170107') => {
+const getEngineDownloadUrl = (id = '175267') => {
   const arch = process.arch === 'arm64' ? 'arm64' : 'amd64';
   return `https://desktop.docker.com/win/main/${arch}/${id}/Docker%20Desktop%20Installer.exe`;
 };
@@ -93,28 +98,24 @@ module.exports = async (lando, options) => {
   const version = getVersion(options.buildEngine);
 
   // cosmetics
-  const buildEngine = process.platform === 'linux' ? 'docker-engine' : 'docker-desktop';
   const install = version ? `v${version}` : `build ${build}`;
 
+  // download url
   const url = getEngineDownloadUrl(build);
 
   // win32 install docker desktop task
   options.tasks.push({
-    title: `Downloading build engine`,
+    title: 'Downloading build engine',
     id: 'setup-build-engine',
-    description: `@lando/build-engine (${buildEngine})`,
-    version: `${buildEngine} ${install}`,
+    description: '@lando/build-engine (docker-desktop)',
+    version: `Docker Desktop ${install}`,
     hasRun: async () => {
-      // start by looking at the engine install status
-      // @NOTE: is this always defined?
-      if (lando.engine.dockerInstalled === false) return false;
+      // if we are missing any files we can check then terminate here
+      if (lando.engine.dockerInstalled === false || !fs.existsSync(getDockerDesktopBin())) return false;
 
       // if we get here let's make sure the engine is on
       try {
-        await lando.engine.daemon.up();
-        const BuildEngine = require('../components/docker-engine');
-        const bengine = new BuildEngine(lando.config.buildEngine, {debug});
-        await bengine.info();
+        await lando.engine.daemon.up({max: 5, backoff: 1000});
         return true;
       } catch (error) {
         lando.log.debug('docker install task has not run %j', error);
@@ -141,7 +142,7 @@ module.exports = async (lando, options) => {
         // download the installer
         ctx.download = await downloadDockerDesktop(url, {ctx, debug, task});
         // script
-        const script = [path.join(lando.config.userConfRoot, 'scripts', 'install-docker-desktop.ps1')];
+        const script = path.join(lando.config.userConfRoot, 'scripts', 'install-docker-desktop.ps1');
         // args
         const args = ['-Installer', ctx.download.dest];
         if (options.buildEngineAcceptLicense) args.push('-AcceptLicense');
@@ -154,7 +155,7 @@ module.exports = async (lando, options) => {
 
         // finish up
         const location = process.env.ProgramW6432 ?? process.env.ProgramFiles;
-        task.title = `Installed build engine to ${location}/Docker/Docker!`;
+        task.title = `Installed build engine (Docker Desktop) to ${location}/Docker/Docker!`;
         return result;
       } catch (error) {
         throw error;
@@ -176,14 +177,20 @@ module.exports = async (lando, options) => {
       // check one last time incase this was added by a dependee or otherwise
       if (require('../utils/is-group-member')('docker-users')) return {code: 0};
 
-      try {
-        const command = ['net', 'localgroup', 'docker-users', lando.config.username, '/ADD'];
-        const response = await require('../utils/run-elevated')(command, {debug});
-        task.title = `Added ${lando.config.username} to docker-users`;
-        return response;
-      } catch (error) {
+      const command = ['net', 'localgroup', 'docker-users', lando.config.username, '/ADD'];
+      const {code, stdout, stderr} = await require('../utils/run-elevated')(command, {ignoreReturnCode: true, debug});
+
+      // fail on anything except 1378 which is user already exists
+      if (code !== 0 && (!stderr.includes('1378') || !stderr.includes('already a member'))) {
+        const error = new Error(`Error adding ${lando.config.username} to the docker-users group!`);
+        error.code = code;
+        error.stdout = stdout;
+        error.stderr = stderr;
         throw error;
       }
+
+      task.title = `Added ${lando.config.username} to docker-users`;
+      return {code, stdout, stderr};
     },
   });
 };