@cruxgarden/cli 0.0.12 → 0.0.13

package/lib/commands.js

@@ -469,17 +469,23 @@ export async function purgeNursery() {
 export async function updateNursery() {
   ensureDockerRunning();
   const spinner = ora(
-    "Checking for latest Crux Garden API image from ghcr.io...",
+    "Checking for latest Crux Garden images from ghcr.io...",
   ).start();
   const envFileFlag = getEnvFileFlag();
 
   try {
-    // Get the current local image digest before pulling
-    const beforeResult = await runCommandAsync(
+    // Get the current local image digests before pulling
+    const apiBeforeResult = await runCommandAsync(
       "docker images --digests --format '{{.Digest}}' ghcr.io/cruxgarden/api:latest",
       { silent: true, ignoreError: true }
     );
-    const digestBefore = beforeResult?.combined?.trim() || beforeResult?.stdout?.trim() || "";
+    const apiDigestBefore = apiBeforeResult?.combined?.trim() || apiBeforeResult?.stdout?.trim() || "";
+
+    const appBeforeResult = await runCommandAsync(
+      "docker images --digests --format '{{.Digest}}' ghcr.io/cruxgarden/app:latest",
+      { silent: true, ignoreError: true }
+    );
+    const appDigestBefore = appBeforeResult?.combined?.trim() || appBeforeResult?.stdout?.trim() || "";
 
     // Pull latest images
     spinner.text = "Pulling latest images...";
@@ -487,32 +493,43 @@ export async function updateNursery() {
       silent: true,
     });
 
-    // Get the image digest after pulling
-    const afterResult = await runCommandAsync(
+    // Get the image digests after pulling
+    const apiAfterResult = await runCommandAsync(
       "docker images --digests --format '{{.Digest}}' ghcr.io/cruxgarden/api:latest",
       { silent: true, ignoreError: true }
     );
-    const digestAfter = afterResult?.combined?.trim() || afterResult?.stdout?.trim() || "";
+    const apiDigestAfter = apiAfterResult?.combined?.trim() || apiAfterResult?.stdout?.trim() || "";
+
+    const appAfterResult = await runCommandAsync(
+      "docker images --digests --format '{{.Digest}}' ghcr.io/cruxgarden/app:latest",
+      { silent: true, ignoreError: true }
+    );
+    const appDigestAfter = appAfterResult?.combined?.trim() || appAfterResult?.stdout?.trim() || "";
 
-    // Compare digests to see if image was updated
-    if (digestBefore && digestAfter && digestBefore === digestAfter) {
-      spinner.succeed("Nursery image is already up-to-date!");
+    // Check which images were updated
+    const apiUpdated = apiDigestBefore && apiDigestAfter && apiDigestBefore !== apiDigestAfter;
+    const appUpdated = appDigestBefore && appDigestAfter && appDigestBefore !== appDigestAfter;
+
+    if (!apiUpdated && !appUpdated && apiDigestAfter && appDigestAfter) {
+      spinner.succeed("Nursery images are already up-to-date!");
       console.log(
         chalk.gray("\nYou're running the latest version."),
       );
-    } else if (digestAfter) {
-      spinner.succeed("Latest nursery image downloaded!");
-      console.log(
-        chalk.gray("\nRun"),
-        chalk.cyan("crux nursery restart"),
-        chalk.gray("to use the new image."),
-      );
     } else {
-      spinner.succeed("Images pulled successfully!");
+      const updatedImages = [];
+      if (apiUpdated) updatedImages.push("API");
+      if (appUpdated) updatedImages.push("App");
+
+      if (updatedImages.length > 0) {
+        spinner.succeed(`Latest nursery images downloaded! (${updatedImages.join(", ")} updated)`);
+      } else {
+        spinner.succeed("Images pulled successfully!");
+      }
+
       console.log(
         chalk.gray("\nRun"),
         chalk.cyan("crux nursery restart"),
-        chalk.gray("to use the latest images."),
+        chalk.gray("to use the new images."),
       );
     }
   } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cruxgarden/cli",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "description": "Crux Garden CLI",
   "type": "module",
   "bin": {