@or3/cloud 0.1.55 → 0.1.57

package/assets/dashboard-operator.mjs

@@ -356,8 +356,8 @@ function updaterEnvironment(installDirectory, job, imageDigest) {
     NPM_CONFIG_IGNORE_SCRIPTS: 'true',
     NPM_CONFIG_AUDIT: 'false',
     NPM_CONFIG_FUND: 'false',
-    NPM_CONFIG_USERCONFIG: '/dev/null',
-    NPM_CONFIG_GLOBALCONFIG: '/dev/null',
+    NPM_CONFIG_USERCONFIG: join(installDirectory, 'disabled-user.npmrc'),
+    NPM_CONFIG_GLOBALCONFIG: join(installDirectory, 'disabled-global.npmrc'),
     OR3_DASHBOARD_UPDATE_JOB_ID: job.id,
     ...(imageDigest ? { OR3_EXPECTED_IMAGE_DIGEST: imageDigest } : {}),
   };
@@ -627,26 +627,63 @@ async function completeOperatorHandoff(jobId, project) {
       && state
       && !state.incompleteOperation
     ) {
-      await delay(1_000);
       const environment = await deploymentEnv();
       if (envValue(environment, 'OR3_DASHBOARD_UPDATES_ENABLED') !== 'true') return;
-      const restarted = await runProcess('docker', [
-        'compose',
-        '--project-name', project,
-        '--project-directory', deploymentDirectory,
-        '--env-file', join(deploymentDirectory, '.env'),
-        '-f', join(deploymentDirectory, 'compose.yaml'),
-        '-f', join(deploymentDirectory, 'compose.operator.yaml'),
-        'up', '-d', '--no-deps', '--force-recreate', 'or3-operator',
-      ], {
-        cwd: deploymentDirectory,
-        env: process.env,
-        timeoutMs: 60_000,
-      });
-      if (restarted.code !== 0) {
-        throw new Error(`The dashboard operator handoff could not start its successor: ${restarted.output}`);
+      const serviceFilters = [
+        '--filter', `label=com.docker.compose.project=${project}`,
+        '--filter', 'label=com.docker.compose.service=or3-operator',
+      ];
+      let lastOutput = '';
+      for (let attempt = 0; attempt < 6; attempt += 1) {
+        // Old protocol-v1 operators may start their own Compose replacement
+        // after writing the terminal job. Removing every container for this
+        // one stateless service also kills that in-container Compose child and
+        // clears any half-created successor without touching the application.
+        for (let sweep = 0; sweep < 2; sweep += 1) {
+          const listed = await runProcess('docker', ['ps', '-aq', ...serviceFilters], {
+            cwd: deploymentDirectory,
+            env: process.env,
+            timeoutMs: 30_000,
+          });
+          lastOutput = listed.output;
+          const containerIds = listed.code === 0
+            ? listed.output.split(/\s+/).filter((value) => /^[0-9a-f]{12,64}$/i.test(value))
+            : [];
+          if (containerIds.length > 0) {
+            const removed = await runProcess('docker', ['rm', '--force', ...containerIds], {
+              cwd: deploymentDirectory,
+              env: process.env,
+              timeoutMs: 30_000,
+            });
+            lastOutput = `${lastOutput}\n${removed.output}`.trim();
+          }
+          await delay(750);
+        }
+        const compose = [
+          'compose',
+          '--project-name', project,
+          '--project-directory', deploymentDirectory,
+          '--env-file', join(deploymentDirectory, '.env'),
+          '-f', join(deploymentDirectory, 'compose.yaml'),
+          '-f', join(deploymentDirectory, 'compose.operator.yaml'),
+        ];
+        const restarted = await runProcess('docker', [...compose, 'up', '-d', '--no-deps', 'or3-operator'], {
+          cwd: deploymentDirectory,
+          env: process.env,
+          timeoutMs: 60_000,
+        });
+        const running = restarted.code === 0
+          ? await runProcess('docker', [...compose, 'ps', '--status', 'running', '-q', 'or3-operator'], {
+              cwd: deploymentDirectory,
+              env: process.env,
+              timeoutMs: 30_000,
+            })
+          : { code: restarted.code, output: '' };
+        lastOutput = `${lastOutput}\n${restarted.output}\n${running.output}`.trim();
+        if (restarted.code === 0 && running.code === 0 && /^[0-9a-f]{12,64}$/i.test(running.output.trim())) return;
+        await delay(2_000);
       }
-      return;
+      throw new Error(`The dashboard operator handoff could not start its successor: ${lastOutput}`);
     }
     await delay(250);
   }

package/dist/cli.mjs

@@ -30,7 +30,7 @@ import { fileURLToPath } from "node:url";
 import { createGunzip } from "node:zlib";
 var execFile = promisify(execFileCallback);
 var PACKAGE_ROOT = resolve(fileURLToPath(new URL("../", import.meta.url)));
-var PACKAGE_VERSION = "0.1.55";
+var PACKAGE_VERSION = "0.1.57";
 var IMAGE_REPOSITORY = "ghcr.io/saluana/or3-chat";
 var ASSET_ROOT = resolve(fileURLToPath(new URL("../assets/", import.meta.url)));
 var STATE_SCHEMA_VERSION = 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@or3/cloud",
-  "version": "0.1.55",
+  "version": "0.1.57",
   "description": "Install and operate the OR3 Cloud container distribution",
   "type": "module",
   "license": "GPL-3.0",
@@ -18,9 +18,9 @@
   "or3Cloud": {
     "dashboardUpdateProtocol": 1,
     "dashboardUpdateMinimumSourceVersion": "0.1.40",
-    "imageDigest": "sha256:d92a7a6b8e8a198a59c6506a5385beda6b7c829fc30406bc4653a388b8c5b638",
-    "operatorImageDigest": "sha256:e8149df09dc59d3184c325de09d5662b4efe8dccba70dfdde453b2fb5365c335",
-    "sourceRevision": "7a73e723edd4ca01ca7a387aad6902e185a8d16c"
+    "imageDigest": "sha256:0f493438a906cec53442991a7b63d77166708cb506a37dac10022a0f15dd57d3",
+    "operatorImageDigest": "sha256:8937743e7fa9648bcae7d4565198a515db67899bfe077c092a4affb6fa2bc75b",
+    "sourceRevision": "4d3bb9ef8b826a78345a3ceb02ce31157190496d"
   },
   "files": [
     "dist",