#763 #1460: WARPFACTOR3

lando · Feb 21, 2019 · 556c850 · 556c850
1 parent 79a2062
commit 556c850
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 22 deletions.
diff --git a/plugins/lando-services/services/php/builder.js b/plugins/lando-services/services/php/builder.js
@@ -123,9 +123,6 @@ module.exports = {
       options = parseConfig(_.merge({}, config, options));
       // Mount our default php config
       options.volumes.push(`${options.confDest}/${options.defaultFiles._php}:${options.remoteFiles._php}`);
-      // options.volumes.push(`${options._app.root}:/app:delegated`);
-      // options.volumes.push('exclude_vendor:/app/vendor');
-      // options.volumes.push('exclude_core:/app/core');
 
       // Shift on the docker entrypoint if this is a more recent version
       // @TODO: can we assume we will always have major.minor for php release?

diff --git a/plugins/lando-sharing/app.js b/plugins/lando-sharing/app.js
@@ -3,6 +3,7 @@
 // Modules
 const _ = require('lodash');
 const path = require('path');
+const toObject = require('./../../lib/utils').toObject;
 const utils = require('./lib/utils');
 
 // Helper to make excludes unique
@@ -33,7 +34,7 @@ module.exports = (app, lando) => {
         const mountDir = path.join(lando.config.userConfRoot, 'mounter', app.name);
         const mountFiles = lando.utils.dumpComposeData(mountData, mountDir);
         return lando.engine.run({
-          compose: _.flatten([app.compose, mountFiles]),
+          compose: mountFiles,
           project: app.project,
           cmd: getPopCommand(excludes),
           opts: {
@@ -48,26 +49,12 @@ module.exports = (app, lando) => {
 
     // Sharing is caring
     app.events.on('post-init', () => {
-      // Add the top level volumes
-      app.add(new app.ComposeService('excludes-volumes', {}, {
+      app.add(new app.ComposeService('excludes', {}, {
         volumes: utils.getNamedVolumes(excludes),
+        services: toObject(app.services, {
+          volumes: utils.getServiceVolumes(excludes, '/app'),
+        }),
       }));
-      // Drill down into each service and modify the volumes
-      // @NOTE: for some reason this is necessary and we cant do the same thing
-      // we are doing above, seems like the nested /app volumes need to be declared in teh same place
-      // and early on
-      /*
-      _.forEach(app.composeData, service => {
-        if (_.includes(app.services, service.id) && _.has(service.data[0], `services.${service.id}.volumes`)) {
-          // Re-add the host mounted /app
-          service.data[0].services[service.id].volumes.push(`${app.root}:/app:delegated`);
-          // Add the named volumes
-          _.forEach(utils.getServiceVolumes(excludes, '/app'), volume => {
-            service.data[0].services[service.id].volumes.push(volume);
-          });
-        }
-      })
-      */
     });
   }
 };