dokku-compose 0.6.12 → 0.7.0

package/dist/index.js

@@ -129,10 +129,13 @@ function createRunner(opts = {}) {
   const log = [];
   const controlPath = opts.host ? path.join(os.tmpdir(), `dc-${createHash("sha1").update(opts.host).digest("hex").slice(0, 16)}.sock`) : null;
   const sshControlFlags = controlPath ? ["-o", "ControlMaster=auto", "-o", `ControlPath=${controlPath}`, "-o", "ControlPersist=60"] : [];
+  function shellQuote(arg) {
+    return `'${arg.replace(/'/g, "'\\''")}'`;
+  }
   async function execDokku(args) {
     if (opts.host) {
       try {
-        const result = await execa("ssh", [...sshControlFlags, `dokku@${opts.host}`, ...args]);
+        const result = await execa("ssh", [...sshControlFlags, `dokku@${opts.host}`, "--", ...args.map(shellQuote)]);
         return { stdout: result.stdout, ok: true };
       } catch (e) {
         return { stdout: e.stdout ?? "", ok: false };
@@ -150,7 +153,7 @@ function createRunner(opts = {}) {
     dryRunLog: log,
     async run(...args) {
       if (opts.dryRun) {
-        log.push(args.join(" "));
+        log.push(args.map((a) => a.includes(" ") ? shellQuote(a) : a).join(" "));
         return;
       }
       await execDokku(args);
@@ -890,8 +893,38 @@ async function destroyServices(ctx, services) {
     logDone();
   }
 }
-async function exportServices(_ctx) {
-  return {};
+var SERVICE_PLUGINS = ["postgres", "redis"];
+async function exportServices(ctx) {
+  const services = {};
+  const pluginOutput = await ctx.query("plugin:list");
+  const installedPlugins = new Set(
+    pluginOutput.split("\n").map((line) => line.trim().split(/\s+/)[0]).filter(Boolean)
+  );
+  for (const plugin of SERVICE_PLUGINS) {
+    if (!installedPlugins.has(plugin)) continue;
+    const listOutput = await ctx.query(`${plugin}:list`);
+    const lines = listOutput.split("\n").slice(1);
+    for (const line of lines) {
+      const name = line.trim().split(/\s+/)[0];
+      if (!name) continue;
+      const infoOutput = await ctx.query(`${plugin}:info`, name);
+      const versionMatch = infoOutput.match(/Version:\s+(\S+)/);
+      if (!versionMatch) continue;
+      const versionField = versionMatch[1];
+      const colonIdx = versionField.lastIndexOf(":");
+      const config = { plugin };
+      if (colonIdx > 0) {
+        const image = versionField.slice(0, colonIdx);
+        const version2 = versionField.slice(colonIdx + 1);
+        if (image !== plugin) config.image = image;
+        if (version2) config.version = version2;
+      } else {
+        config.version = versionField;
+      }
+      services[name] = config;
+    }
+  }
+  return services;
 }
 async function exportAppLinks(ctx, app, services) {
   const linked = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dokku-compose",
-  "version": "0.6.12",
+  "version": "0.7.0",
   "description": "Docker Compose for Dokku — declare your entire server in a single YAML file.",
   "main": "dist/index.js",
   "exports": "./dist/index.js",