@joystick.js/cli-canary 0.0.0-canary.1664 → 0.0.0-canary.1666

package/dist/commands/push_v2/Dockerfile

@@ -1,5 +1,5 @@
-# Use Ubuntu 24.04 as the base image
-FROM ubuntu:24.04
+# Use Debian Slim as the base image
+FROM debian:bullseye-slim
 
 # Avoid prompts from apt
 ENV DEBIAN_FRONTEND=noninteractive
@@ -10,10 +10,8 @@ ENV NODE_VERSION=20.x
 # Install Node.js 20 and common dependencies
 RUN apt-get update && apt-get install -y \
     curl \
-    zip \
-    unzip \
-    git \
-    build-essential \
+    ca-certificates \
+    gnupg \
     && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
     && apt-get install -y nodejs \
     && apt-get clean \
@@ -43,8 +41,17 @@ RUN if [ ! -z "$GLOBAL_NPM_PACKAGES" ]; then \
 # Set the working directory in the container
 WORKDIR /app
 
-# Copy the pre-built application
-COPY ./.build /app
+# Copy package.json and package-lock.json (if available)
+COPY ./.build/package*.json ./
+
+# Install NPM dependencies
+RUN npm ci --only=production
+
+# Add build argument to invalidate cache
+ARG CACHEBUST=1
+
+# Copy the rest of the pre-built application
+COPY ./.build .
 
 # Expose the port the app runs on
 EXPOSE 2600

package/dist/commands/push_v2/build_docker_image.js

@@ -1 +1 @@
-import{exec as m,execSync as p}from"child_process";import t from"path";import{fileURLToPath as k}from"url";import c from"fs";const g=k(import.meta.url),_=t.dirname(g),$=()=>{try{return p("docker --version",{stdio:"ignore"}),!0}catch{return!1}},b=(e="",i="",{apt_deps:d=[],npm_deps:l=[]}={})=>new Promise((a,o)=>{if(!$()){process.loader.print("Push requires Docker to deploy your app. 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=t.join(_,"Dockerfile");if(!c.existsSync(n)){o(new Error(`Dockerfile not found at ${n}`));return}if(!i||!c.existsSync(t.join(i,".build"))){o(new Error("Invalid context path or .build directory not found"));return}const u=`docker build ${[`CUSTOM_APT_DEPS=${d.join(" ")}`,`GLOBAL_NPM_PACKAGES=${l.join(" ")}`].map(r=>`--build-arg ${r}`).join(" ")} -t ${e} -f "${n}" "${i}"`;m(u,(r,f,s)=>{if(r){console.error(`Error building Docker image: ${r.message}`),o(r);return}s&&console.error(`Docker build stderr: ${s}`),process.loader.print(f),process.loader.print(`Successfully built Docker image: ${e}`),a()})});var E=b;export{E 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.1664",
-  "canary_version": "0.0.0-canary.1663",
+  "version": "0.0.0-canary.1666",
+  "canary_version": "0.0.0-canary.1665",
   "description": "The CLI for Joystick.",
   "main": "dist/index.js",
   "bin": {

package/src/commands/push_v2/Dockerfile

@@ -1,5 +1,5 @@
-# Use Ubuntu 24.04 as the base image
-FROM ubuntu:24.04
+# Use Debian Slim as the base image
+FROM debian:bullseye-slim
 
 # Avoid prompts from apt
 ENV DEBIAN_FRONTEND=noninteractive
@@ -10,10 +10,8 @@ ENV NODE_VERSION=20.x
 # Install Node.js 20 and common dependencies
 RUN apt-get update && apt-get install -y \
     curl \
-    zip \
-    unzip \
-    git \
-    build-essential \
+    ca-certificates \
+    gnupg \
     && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
     && apt-get install -y nodejs \
     && apt-get clean \
@@ -43,8 +41,17 @@ RUN if [ ! -z "$GLOBAL_NPM_PACKAGES" ]; then \
 # Set the working directory in the container
 WORKDIR /app
 
-# Copy the pre-built application
-COPY ./.build /app
+# Copy package.json and package-lock.json (if available)
+COPY ./.build/package*.json ./
+
+# Install NPM dependencies
+RUN npm ci --only=production
+
+# Add build argument to invalidate cache
+ARG CACHEBUST=1
+
+# Copy the rest of the pre-built application
+COPY ./.build .
 
 # Expose the port the app runs on
 EXPOSE 2600

package/src/commands/push_v2/build_docker_image.js

@@ -25,7 +25,7 @@ const build_docker_image = (
 ) => {
   return new Promise((resolve, reject) => {
     if (!check_docker_installation()) {
-      process.loader.print("Push requires Docker to deploy your app. Visit https://docs.docker.com/get-started/get-docker/ to download docker for your OS.");
+      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.");
       reject(new Error("Docker is not installed or not in the PATH"));
       return;
     }
@@ -48,21 +48,29 @@ const build_docker_image = (
     // 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}"`;
 
-    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();
     });