first pass on lando 4 service storage part 2

lando · Jul 29, 2024 · 4d97a46 · 4d97a46
1 parent 2ce43ca
commit 4d97a46
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/builders/lando-v4.js b/builders/lando-v4.js
@@ -61,6 +61,7 @@ module.exports = {
         'ssh-agent': true,
         'sudo': true,
       },
+      'persistent-storage': [],
       'overrides': {},
       'ports': [],
       'security': {
@@ -69,6 +70,7 @@ module.exports = {
         'cas': [],
         'certificate-authorities': [],
       },
+      'storage': [],
     },
   },
   router: () => ({}),
@@ -208,7 +210,10 @@ module.exports = {
       this.router = upstream.router;
       this.security = config.security;
       this.security.cas.push(caCert, path.join(path.dirname(caCert), `${caDomain}.pem`));
-      this.storage = require('../utils/normalize-storage')(config.storage, this);
+      this.storage = [
+        ...require('../utils/normalize-storage')(config.storage, this),
+        ...require('../utils/normalize-storage')(config['persistent-storage'], this),
+      ];
       this.user = user;
 
       // top level stuff

diff --git a/hooks/app-run-v4-destroy-service.js b/hooks/app-run-v4-destroy-service.js
@@ -24,7 +24,7 @@ module.exports = async (app, lando) => {
   const tasks = services.map(service => {
     const container = [app.project, service.id, '1'].join(lando.config.orchestratorSeparator);
     return {
-      title: `Image for ${container}`,
+      title: `Container ${container}`,
       task: async (ctx, task) => {
         try {
           await service.destroy();
@@ -40,10 +40,10 @@ module.exports = async (app, lando) => {
   await app.runTasks(tasks, {
     renderer: 'dc2',
     rendererOptions: {
-      header: 'Destroying',
+      header: 'Clean Up',
       states: {
-        COMPLETED: 'Destroyed',
-        STARTED: 'Destroying',
+        COMPLETED: 'Cleaned',
+        STARTED: 'Cleaning',
         FAILED: 'FAILED',
       },
     },