No progress but docker ps

domcloud · Sep 18, 2024 · 52279d0 · 52279d0
1 parent a51258e
commit 52279d0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/executor/docker.js b/src/executor/docker.js
@@ -157,11 +157,11 @@ class DockerExecutor {
         } else {
             composeObject.services = services;
         }
-        composeObject.services = this.rewriteServices(composeObject.services, domain);
+        composeObject.services = await this.rewriteServices(composeObject.services, domain);
         let composeFile = yaml.stringify(composeObject);
         await executeLock('compose', () => {
             return new Promise((resolve, reject) => {
-                ShellString(composeFile).to(filename)
+                ShellString(composeFile).to(tmpFile)
                 spawnSudoUtil('COMPOSE_SET', [filename]).then(resolve).catch(reject);
             });
         });

diff --git a/src/executor/runner.js b/src/executor/runner.js
@@ -140,6 +140,7 @@ export default async function runConfig(config, domain, writer, sandbox = false)
         sshExec = ( /** @type {string} */ cmd, write = true) => {
             return new Promise(function (resolve, reject) {
                 if (!ssh) return reject("shell has terminated already");
+                let first = true;
                 cb = (/** @type {string} */ chunk, code) => {
                     if (!ssh) {
                         if (code) {
@@ -159,10 +160,17 @@ export default async function runConfig(config, domain, writer, sandbox = false)
                         }
                         resolve();
                         return true;
+                    } else if (first && chunk.startsWith("<")) {
+                        // stdin line skips
+                        if (chunk.includes("\n")) {
+                            first = false;
+                        }
+                        return false;
                     } else {
                         if (write && chunk) {
                             writer(chunk);
                         }
+                        first = false;
                         return false;
                     }
                 };

diff --git a/src/executor/runnersub.js b/src/executor/runnersub.js
@@ -472,9 +472,9 @@ export async function runConfigSubdomain(config, domaindata, subdomain, sshExec,
         if (config.services) {
             await writeLog("$> Removing docker compose services if exists");
             if (typeof config.services == 'string') {
-                await sshExec(`docker compose -f ${config.services} --progress plain down --remove-orphans --rmi all || true`);
+                await sshExec(`docker compose -f ${config.services} --progress quiet down --remove-orphans --rmi all || true`);
             } else {
-                await sshExec(`docker compose --progress-plain down --remove-orphans --rmi all || true`);
+                await sshExec(`docker compose --progress-plain quiet --remove-orphans --rmi all || true`);
             }
             await writeLog("$> Writing docker compose services");
             let d = await dockerExec.executeServices(config.services, subdomaindata['Home directory'] + '/public_html', subdomain);
@@ -485,6 +485,7 @@ export async function runConfigSubdomain(config, domaindata, subdomain, sshExec,
             } else {
                 await sshExec(`docker compose up --build --detach`);
             }
+            await sshExec(`docker ps`);
         }
 
         if (config.commands) {