run-spaceapp 1.0.31 → 1.0.35

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "run-spaceapp",
-  "version": "1.0.31",
-  "spaceappRuntimeVersion": "1.0.31",
+  "version": "1.0.35",
+  "spaceappRuntimeVersion": "1.0.35",
   "spaceappHostRootRuntimeCompatible": true,
   "description": "Cross-platform Docker launcher for the SpaceApp self-hosted agent workspace",
   "license": "Apache-2.0",
@@ -52,5 +52,5 @@
     "access": "public",
     "provenance": true
   },
-  "gitHead": "2769d82e1077c9316c6452f40c4996e0290ce083"
+  "gitHead": "6010f556f9f782fe545e08d1465d3b98745de9d8"
 }

package/src/cli.mjs

@@ -1319,7 +1319,7 @@ async function performUpdate({
   const stagedRoot = await mkdtemp(join(tmpdir(), "spaceapp-update-"));
   let checkpoint = null;
   try {
-    await writeRuntimeFiles(stagedRoot, updated);
+    await commitInstallation(stagedRoot, updated);
     const stagedCommand = (action) => composeCommand(action, root, {...updated, stateRoot: stagedRoot});
     const pullCode = await withHeadlessDockerConfig(
       platform, stagedCommand("pull"),
@@ -1331,7 +1331,7 @@ async function performUpdate({
     }
     if (await verifyStorage({ root, config: updated, existingConfig: config, operation: "upgrade", inspectResources, execute, stdout, stderr }) !== 0) return 1;
     checkpoint = await createQuiescedCheckpoint(root, config, {stdin, stdout, stderr, execute, platform});
-    await writeRuntimeFiles(root, updated);
+    await commitInstallation(root, updated, { persistConfig: false });
     const upCode = await execute(
       composeCommand("up", root, { profile: updated.profile, companionsEnabled: updated.companionsEnabled }),
       { stdin, stdout, stderr }
@@ -1410,6 +1410,9 @@ async function collectFiles(directory, logicalDirectory) {
 async function createQuiescedCheckpoint(root, config, io) {
   io.stdout.write("Pausing SpaceApp writers before the database checkpoint...\n");
   try {
+    io.stdout.write("Ensuring the existing PostgreSQL database is ready for the checkpoint...\n");
+    const databaseCode = await io.execute(composeCommand("ensureCheckpointDatabase", root, config), io);
+    if (databaseCode !== 0) throw new Error(`The existing PostgreSQL database did not become ready (exit ${databaseCode}). The upgrade was not applied.`);
     const code = await io.execute(composeCommand("stopForRestore", root, config), io);
     if (code !== 0) throw new Error(`Could not pause SpaceApp writers (exit ${code}).`);
     return await createCheckpoint(root, config, io);

package/src/index.mjs

@@ -677,6 +677,7 @@ export function composeCommand(action, root, options = {}) {
     storageFree: ["exec", "-T", "spaceapp-core", "node", "-e", "const fs=require('node:fs');const s=fs.statfsSync('/var/lib/spaceapp');console.log(Number(s.bavail)*Number(s.bsize))"],
     purge: ["down", "--volumes", "--remove-orphans"],
     repair: ["up", "-d", "--remove-orphans", "--force-recreate"],
+    ensureCheckpointDatabase: ["up", "-d", "--no-deps", "--wait", "--wait-timeout", "120", "postgres"],
     checkpointDump: ["exec", "-T", "postgres", "pg_dump", "-c", "--if-exists", "-U", "spaceapp", "-d", "spaceapp"],
     checkpointRestore: ["exec", "-T", "postgres", "psql", "-v", "ON_ERROR_STOP=1", "-U", "spaceapp", "-d", "spaceapp"]
   };
@@ -848,7 +849,8 @@ export async function prepareInstallation(root, {
 }
 
 export async function commitInstallation(root, config, {
-  templateDir = defaultTemplateDir()
+  templateDir = defaultTemplateDir(),
+  persistConfig = true
 } = {}) {
   validateHome(root);
   validateConfig(config);
@@ -856,7 +858,7 @@ export async function commitInstallation(root, config, {
   await mkdir(root, { recursive: true, mode: 0o700 });
   await atomicWrite(join(root, "compose.yml"), composeTemplate);
   await writeRuntimeFiles(root, config);
-  await saveConfig(root, config);
+  if (persistConfig) await saveConfig(root, config);
 }
 
 export async function initializeInstallation(root, options) {

package/templates/compose.yml

@@ -3,12 +3,6 @@ services:
     image: ghcr.io/oll4com/spaceapp-core:${SPACEAPP_IMAGE_TAG}
     restart: unless-stopped
     init: true
-    entrypoint:
-      - /bin/sh
-      - -ec
-      - |
-        sed -i 's/agentToolsWriterCommand: env.SPACE_AGENT_TOOLS_WRITER || [^,]*/agentToolsWriterCommand: null/g' /app/apps/api/dist/config.js 2>/dev/null || true
-        exec /app/deploy/docker/core-entrypoint.sh
     security_opt:
       - no-new-privileges:true
     mem_limit: "${SPACEAPP_CORE_MEMORY_LIMIT}"