@florianpat/lando-core 3.23.27-2florianPat.0 → 3.23.27-4florianPat.1

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
-## v3.23.27-2florianPat.0 - [February 19, 2025](https://github.com/florianPat/lando-core/releases/tag/v3.23.27-2florianPat.0)
+## v3.23.27-4florianPat.1 - [March 5, 2025](https://github.com/florianPat/lando-core/releases/tag/v3.23.27-4florianPat.1)
 
 ## v3.23.26 - [January 24, 2025](https://github.com/lando/core/releases/tag/v3.23.26)
 

package/app.js

@@ -131,7 +131,7 @@ module.exports = async (app, lando) => {
   app.events.on('ready', 1, async () => await require('./hooks/app-override-tooling-defaults')(app, lando));
 
   // set tooling compose cache
-  app.events.on('ready', async () => await require('./hooks/app-set-compose-cache')(app, lando));
+  app.events.on('ready-engine', async () => await require('./hooks/app-set-compose-cache')(app, lando));
 
   // v4 parts of the app are ready
   app.events.on('ready', 6, async () => await require('./hooks/app-v4-ready')(app, lando));
@@ -144,7 +144,7 @@ module.exports = async (app, lando) => {
 
   // Save a compose cache every time the app is ready, we have to duplicate this for v4 because we modify the
   // composeData after the v3 app.ready event
-  app.events.on('ready-v4', async () => await require('./hooks/app-set-v4-compose-cache')(app, lando));
+  app.events.on('ready-engine', async () => await require('./hooks/app-set-v4-compose-cache')(app, lando));
 
   // Otherwise set on rebuilds
   // NOTE: We set this pre-rebuild because post-rebuild runs after post-start because you would need to

package/lib/app.js

@@ -283,6 +283,8 @@ module.exports = class App {
       console.log(require('yargonaut').chalk().cyan('Looks like this is the first time to start the app. Lets bootstrap it...'));
     }
 
+    const composeEnvFiles = require('../utils/normalize-files')(_.get(this, 'config.compose_env_file', []), this.root);
+
     return loadPlugins(this, this._lando)
     /**
      * Event that only gets triggered if the app never started before (or was destroyed)
@@ -299,7 +301,7 @@ module.exports = class App {
       this.root,
       this._dir,
       (composeFiles, outputFilePath) =>
-        this.engine.getComposeConfig({compose: composeFiles, project: this.project, outputFilePath}),
+        this.engine.getComposeConfig({compose: composeFiles, project: this.project, outputFilePath, opts: {envFiles: composeEnvFiles}}),
     ))
     .then(composeFileData => {
       this.composeData = [new this.ComposeService('compose', {}, ...composeFileData)];

package/lib/cli.js

@@ -317,6 +317,7 @@ module.exports = class Cli {
       .option('help', globalOptions.help)
       .option('verbose', globalOptions.verbose)
       .version(false)
+      .env('lando_cli_')
       .middleware([(argv => {
         argv._app = config;
         argv._yargs = yargs;

package/lib/compose.js

@@ -77,21 +77,22 @@ const parseOptions = (opts = {}) => {
 /*
  * Helper to standardize construction of docker commands
  */
-const buildCmd = (run, name, compose, {services, cmd}, opts = {}) => {
+const buildCmd = (run, name, compose, {services, cmd, envFiles}, opts = {}) => {
   if (!name) throw new Error('Need to give this composition a project name!');
   // @TODO: we need to strip out opts.user on start/stop because we often get it as part of run
   const project = ['--project-name', name];
   const files = _.flatten(_.map(compose, unit => ['--file', unit]));
+  const envFile = _.flatten(_.map(envFiles, unit => ['--env-file', unit]));
   const options = parseOptions(opts);
   const argz = _.flatten(_.compact([services, cmd]));
-  return _.flatten([project, files, run, options, argz]);
+  return _.flatten([project, files, envFile, run, options, argz]);
 };
 
 /*
  *  Helper to build build object needed by lando.shell.sh
  */
 const buildShell = (run, name, compose, opts = {}) => ({
-  cmd: buildCmd(run, name, compose, {services: opts.services, cmd: opts.cmd}, mergeOpts(run, opts)),
+  cmd: buildCmd(run, name, compose, {services: opts.services, cmd: opts.cmd, envFiles: opts.envFiles ?? []}, mergeOpts(run, opts)),
   opts: {mode: 'spawn', cstdio: opts.cstdio, silent: opts.silent},
 });
 

package/lib/engine.js

@@ -506,6 +506,7 @@ module.exports = class Engine {
    * @param {String} data.project A String of the project name (Usually this is the same as the app name)
    * @param {String} [data.outputFilePath='/path/to/file.yml'] String to output path
    * @param {Object} [data.opts] Options
+   * @param {Array} [data.opts.envFiles] An Array of paths to env files
    * @return {Promise} A Promise.
    * @example
    * return lando.engine.stop(app);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@florianpat/lando-core",
   "description": "The libraries that power all of Lando. Fork by flo for compose integration",
-  "version": "3.23.27-2florianPat.0",
+  "version": "3.23.27-4florianPat.1",
   "author": "Florian Patruck @florianPat",
   "license": "GPL-3.0",
   "repository": "florianPat/lando-core",
@@ -247,9 +247,9 @@
     "yargs-parser"
   ],
   "dist": {
-    "integrity": "sha512-nJ+omUdEgvWWSzY820agmarvTKCfYXYkslyaSNxCZOtyctgzRioHpx4qXRvYnoaHS6q6zjCwSShslZAGwPyyyw==",
-    "shasum": "864b2749e3dd4bf4691b29fd9aeb45046c61f402",
-    "filename": "florianpat-lando-core-3.23.27-2florianPat.0.tgz",
-    "unpackedSize": 60967423
+    "integrity": "sha512-ZWcPay0jFJhJHu87HM67Mz4zzHfA2LI3CoZxxcwvPNO3jOEi39k6bibn5eja59IKli2zkf+7XT0otfKaDE1PfQ==",
+    "shasum": "365b707641df970d3b6b7a5253f02c81b89d8b02",
+    "filename": "florianpat-lando-core-3.23.27-4florianPat.1.tgz",
+    "unpackedSize": 60967664
   }
 }

package/tasks/exec.js

@@ -1,11 +1,11 @@
 'use strict';
 
 // Modules
-const fs = require('fs');
-const path = require('path');
 const _ = require('lodash');
 
 const {color} = require('listr2');
+const fs = require('fs');
+const path = require('path');
 
 // @TODO: when we have a file for recipes/compose we can set choices on service
 
@@ -14,7 +14,7 @@ module.exports = (lando, config = lando.appConfig) => ({
   describe: 'Runs command(s) on a service',
   usage: '$0 exec <service> [--user <user>] -- <command>',
   override: true,
-  level: 'engine',
+  level: 'app',
   examples: [
     '$0 exec appserver -- lash bash',
     '$0 exec nginx --user root -- whoami',
@@ -40,7 +40,8 @@ module.exports = (lando, config = lando.appConfig) => ({
 
     // if no app then we need to throw
     if (!fs.existsSync(minapp.composeCache)) {
-      throw new Error('Could not detect a built app. Rebuild or move into the correct location!');
+      const app = lando.getApp(options._app.root);
+      await app.init();
     }
 
     // Build a minimal app
@@ -59,7 +60,7 @@ module.exports = (lando, config = lando.appConfig) => ({
     }
 
     // nice things
-    const aservices = app?.config?.allServices ?? app?.allServices ?? [];
+    const aservices = app.allServices;
     const choices = `[${color.green('choices:')} ${aservices.map(service => `"${service}"`).join(', ')}]`;
 
     // gather our options
@@ -127,8 +128,8 @@ module.exports = (lando, config = lando.appConfig) => ({
     ropts.push(sconf?.overrides?.working_dir ?? sconf?.working_dir);
     // mix in mount if applicable
     ropts.push(app?.mounts[options.service]);
-    ropts.push(!options.deps ?? true);
-    ropts.push(options.autoRemove ?? false);
+    ropts.push(!options.deps ?? false);
+    ropts.push(options.autoRemove ?? true);
 
     // emit pre-exec
     await app.events.emit('pre-exec', config);

package/utils/get-docker-bin-path.js

@@ -5,8 +5,6 @@ const path = require('path');
 
 module.exports = (platform = process.landoPlatform ?? process.platform) => {
   switch (platform) {
-    case 'darwin':
-      return '/Applications/Docker.app/Contents/Resources/bin';
     case 'linux':
       return '/usr/share/lando/bin';
     case 'win32':