@joystick.js/cli-canary 0.0.0-canary.1663 → 0.0.0-canary.1665

package/dist/commands/push_v2/Dockerfile

@@ -41,10 +41,13 @@ RUN if [ ! -z "$GLOBAL_NPM_PACKAGES" ]; then \
     fi
 
 # Set the working directory in the container
-WORKDIR .
+WORKDIR /app
+
+# Add build argument to invalidate cache
+ARG CACHEBUST=1
 
 # Copy the pre-built application
-COPY ./.build .
+COPY ./.build /app
 
 # Expose the port the app runs on
 EXPOSE 2600

package/dist/commands/push_v2/build_docker_image.js

@@ -1,3 +1 @@
-import{exec as m,execSync as f}from"child_process";import n from"path";import{fileURLToPath as k}from"url";import g from"fs";const _=k(import.meta.url),c=n.dirname(_),$=()=>{try{return f("docker --version",{stdio:"ignore"}),!0}catch{return!1}},D=(r="",s="",{apt_deps:l=[],npm_deps:d=[]}={})=>new Promise((a,i)=>{if(!$())return console.log(`
-`),process.loader.print("Push requires Docker to deploy your app. Please visit https://docs.docker.com/get-started/get-docker/ to download Docker for your OS."),console.log(`
-`),process.exit();process.loader.print("Building Docker image for deployment...");const e=n.join(c,"Dockerfile");if(!g.existsSync(e)){i(new Error(`Dockerfile not found at ${e}`));return}const u=`docker build ${[`CUSTOM_APT_DEPS=${l.join(" ")}`,`GLOBAL_NPM_PACKAGES=${d.join(" ")}`].map(o=>`--build-arg ${o}`).join(" ")} -t ${r} -f "${e}" "${s||c}"`;m(u,(o,p,t)=>{if(o){console.error(`Error building Docker image: ${o.message}`),i(o);return}t&&console.error(`Docker build stderr: ${t}`),process.loader.print(p),process.loader.print(`Successfully built Docker image: ${r}`),a()})});var x=D;export{x as default};
+import{exec as f,execSync as m}from"child_process";import s from"path";import{fileURLToPath as k}from"url";import d from"fs";const g=k(import.meta.url),_=s.dirname(g),$=()=>{try{return m("docker --version",{stdio:"ignore"}),!0}catch{return!1}},b=(e="",i="",{apt_deps:l=[],npm_deps:a=[]}={})=>new Promise((u,o)=>{if(!$()){process.loader.print("Push requires Docker to deploy your app. Please visit https://docs.docker.com/get-started/get-docker/ to download Docker for your OS."),o(new Error("Docker is not installed or not in the PATH"));return}process.loader.print("Building Docker image for deployment...");const n=s.join(_,"Dockerfile");if(!d.existsSync(n)){o(new Error(`Dockerfile not found at ${n}`));return}if(!i||!d.existsSync(s.join(i,".build"))){o(new Error("Invalid context path or .build directory not found"));return}const p=`docker build ${[`CUSTOM_APT_DEPS=${l.join(" ")}`,`GLOBAL_NPM_PACKAGES=${a.join(" ")}`,`CACHEBUST=${Date.now()}`].map(r=>`--build-arg ${r}`).join(" ")} -t ${e} -f "${n}" "${i}"`;f(p,{stdio:["pipe","pipe","pipe"]},(r,c,t)=>{if(r){console.error(`Error building Docker image: ${r.message}`),o(r);return}c.trim()&&process.loader.print(c),t.trim()&&!t.includes("Use 'docker scan' to run Snyk tests against images to find vulnerabilities and learn how to fix them")&&console.error(`Docker build stderr: ${t}`),process.loader.print(`Successfully built Docker image: ${e}`),u()})});var w=b;export{w as default};

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@joystick.js/cli-canary",
   "type": "module",
-  "version": "0.0.0-canary.1663",
-  "canary_version": "0.0.0-canary.1662",
+  "version": "0.0.0-canary.1665",
+  "canary_version": "0.0.0-canary.1664",
   "description": "The CLI for Joystick.",
   "main": "dist/index.js",
   "bin": {

package/src/commands/push_v2/Dockerfile

@@ -41,10 +41,13 @@ RUN if [ ! -z "$GLOBAL_NPM_PACKAGES" ]; then \
     fi
 
 # Set the working directory in the container
-WORKDIR .
+WORKDIR /app
+
+# Add build argument to invalidate cache
+ARG CACHEBUST=1
 
 # Copy the pre-built application
-COPY ./.build .
+COPY ./.build /app
 
 # Expose the port the app runs on
 EXPOSE 2600

package/src/commands/push_v2/build_docker_image.js

@@ -25,10 +25,9 @@ const build_docker_image = (
 ) => {
   return new Promise((resolve, reject) => {
     if (!check_docker_installation()) {
-      console.log('\n');
       process.loader.print("Push requires Docker to deploy your app. Please visit https://docs.docker.com/get-started/get-docker/ to download Docker for your OS.");
-      console.log('\n');
-      return process.exit();
+      reject(new Error("Docker is not installed or not in the PATH"));
+      return;
     }
 
     process.loader.print('Building Docker image for deployment...');
@@ -40,24 +39,38 @@ const build_docker_image = (
       return;
     }
 
+    // Ensure context_path is set and contains the .build directory
+    if (!context_path || !fs.existsSync(path.join(context_path, '.build'))) {
+      reject(new Error('Invalid context path or .build directory not found'));
+      return;
+    }
+
     // Prepare build arguments for dependencies
     const build_args = [
       `CUSTOM_APT_DEPS=${apt_deps.join(' ')}`,
-      `GLOBAL_NPM_PACKAGES=${npm_deps.join(' ')}`
+      `GLOBAL_NPM_PACKAGES=${npm_deps.join(' ')}`,
+      `CACHEBUST=${Date.now()}` // Add timestamp to invalidate cache
     ].map(arg => `--build-arg ${arg}`).join(' ');
 
-    const command = `docker build ${build_args} -t ${image_name} -f "${dockerfile_path}" "${context_path || __dirname}"`;
+    const command = `docker build ${build_args} -t ${image_name} -f "${dockerfile_path}" "${context_path}"`;
 
-    exec(command, (error, stdout, stderr) => {
+    exec(command, { stdio: ['pipe', 'pipe', 'pipe'] }, (error, stdout, stderr) => {
       if (error) {
         console.error(`Error building Docker image: ${error.message}`);
         reject(error);
         return;
       }
-      if (stderr) {
+      
+      // Only log stdout if it's not empty
+      if (stdout.trim()) {
+        process.loader.print(stdout);
+      }
+      
+      // Check if stderr contains actual error messages
+      if (stderr.trim() && !stderr.includes("Use 'docker scan' to run Snyk tests against images to find vulnerabilities and learn how to fix them")) {
         console.error(`Docker build stderr: ${stderr}`);
       }
-      process.loader.print(stdout);
+      
       process.loader.print(`Successfully built Docker image: ${image_name}`);
       resolve();
     });