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

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.0 - [March 4, 2025](https://github.com/florianPat/lando-core/releases/tag/v3.23.27-4florianPat.0)
 
 ## v3.23.26 - [January 24, 2025](https://github.com/lando/core/releases/tag/v3.23.26)
 

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/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.0",
   "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-/98U+xsnU1BnJCQAsZZlui8fGnMYfhATamRCi/wy9j29g76GPwXAR5/smdRmEq+Ibyt6SRSvxRVLp9cC7HvERw==",
+    "shasum": "4a4b0505a255aaf87c0a7e663f143a1c43de652d",
+    "filename": "florianpat-lando-core-3.23.27-4florianPat.0.tgz",
+    "unpackedSize": 60967690
   }
 }

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':