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

package/utils/get-compose-x.js

@@ -27,7 +27,7 @@ const getDockerBin = (bin, base, pathFallback = true) => {
   }
 };
 
-module.exports = ({orchestratorVersion = '2.30.3', userConfRoot = os.tmpdir()} = {}) => {
+module.exports = ({orchestratorVersion = '2.31.0', userConfRoot = os.tmpdir()} = {}) => {
   const orchestratorBin = `docker-compose-v${orchestratorVersion}`;
   switch (process.platform) {
     case 'darwin':

package/utils/get-config-defaults.js

@@ -8,20 +8,20 @@ const os = require('os');
 const getBuildEngineVersion = (platform = process.landoPlatform ?? process.platform) => {
   switch (platform) {
     case 'darwin':
-      return '4.36.0';
+      return '4.37.2';
     case 'linux':
-      return '27.3.1';
+      return '27.5.0';
     case 'win32':
-      return '4.36.0';
+      return '4.37.1';
     case 'wsl':
-      return '4.36.0';
+      return '4.37.1';
   }
 };
 
 // Default config
 const defaultConfig = options => ({
   orchestratorSeparator: '_',
-  orchestratorVersion: '2.30.3',
+  orchestratorVersion: '2.31.0',
   configSources: [],
   coreBase: path.resolve(__dirname, '..'),
   disablePlugins: [],

package/utils/get-tasks.js

@@ -3,6 +3,7 @@
 const _ = require('lodash');
 const fs = require('fs');
 const path = require('path');
+const App = require('../lib/app');
 
 /*
  * Paths to /
@@ -40,9 +41,10 @@ const loadCacheFile = file => {
  */
 const appRunner = command => (argv, lando) => {
   const app = lando.getApp(argv._app.root);
+  const service = _.get(app.config, `tooling.${command}.service`, '');
   return lando.events.emit('pre-app-runner', app)
   .then(() => lando.events.emit('pre-command-runner', app))
-  .then(() => app.init().then(() => _.find(app.tasks, {command}).run(argv)));
+  .then(() => app.init({noEngine: '_init' === service}).then(() => _.find(app.tasks, {command}).run(argv)));
 };
 
 /*
@@ -128,7 +130,7 @@ module.exports = (config = {}, argv = {}, tasks = []) => {
 
   // If the tooling command is being called lets assess whether we can get away with engine bootstrap level
   const ids = _(config.tooling).map(task => task.id).filter(_.identity).value();
-  const level = (_.includes(ids, argv._[0])) ? getBsLevel(config, argv._[0]) : 'app';
+  const level = !App.isBootstrapCommand && (_.includes(ids, argv._[0])) ? getBsLevel(config, argv._[0]) : 'app';
 
   // Load all the tasks, remember we need to remove "disabled" tasks (eg non-object tasks) here
   _.forEach(_.get(config, 'tooling', {}), (task, command) => {

package/utils/load-compose-files.js

@@ -12,7 +12,7 @@ const remove = require('./remove');
 module.exports = async (files, dir, landoComposeConfigDir = undefined, outputConfigFunction = undefined) => {
   const composeFilePaths = _(require('./normalize-files')(files, dir)).value();
   if (_.isEmpty(composeFilePaths)) {
-    return {};
+    return [];
   }
 
   if (undefined === outputConfigFunction) {
@@ -29,5 +29,5 @@ module.exports = async (files, dir, landoComposeConfigDir = undefined, outputCon
   fs.unlinkSync(outputFile);
   remove(path.dirname(outputFile));
 
-  return result;
+  return [result];
 };

package/utils/to-lando-container.js

@@ -1,22 +1,36 @@
 'use strict';
 
-module.exports = ({Labels, Id, Status}, separator = '_') => {
+const path = require('path');
+
+module.exports = ({Labels, Id, Status}, separator = '_', src = []) => {
   // Get name of docker container.
   const app = Labels['com.docker.compose.project'];
   const service = Labels['com.docker.compose.service'];
   const num = Labels['com.docker.compose.container-number'];
   const lando = Labels['io.lando.container'];
   const special = Labels['io.lando.service-container'];
+
+  // if we have io.lando.root and io.lando.
+  if (Labels['io.lando.root'] && Labels['io.lando.landofiles']) {
+    src = Labels['io.lando.landofiles'].split(',').map(landofile => path.join(Labels['io.lando.root'], landofile));
+
+  // or legacy support for Labels['io.lando.src']
+  } else if (Labels['io.lando.src']) {
+    src = Labels['io.lando.src'].split(',');
+
+  // or its just unknown
+  } else src = 'unknown';
+
   // Build generic container.
   return {
     id: Id,
     service: service,
     name: [app, service, num].join(separator),
     app: (special !== 'TRUE') ? app : '_global_',
-    src: (Labels['io.lando.src']) ? Labels['io.lando.src'].split(',') : 'unknown',
     kind: (special !== 'TRUE') ? 'app' : 'service',
     lando: (lando === 'TRUE') ? true : false,
     instance: Labels['io.lando.id'] || 'unknown',
     status: Status,
+    src,
   };
 };