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

package/dist/commands/push_v2/Dockerfile

@@ -7,14 +7,13 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Set up environment variables
 ENV NODE_VERSION=20.x
 
-# Install Node.js 20, common dependencies, and snapd
+# Install Node.js 20 and common dependencies
 RUN apt-get update && apt-get install -y \
     curl \
     zip \
     unzip \
     git \
     build-essential \
-    snapd \
     && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
     && apt-get install -y nodejs \
     && apt-get clean \
@@ -23,9 +22,6 @@ RUN apt-get update && apt-get install -y \
 # Verify Node.js version
 RUN node --version
 
-# Initialize snap
-RUN snap install core
-
 # Allow custom apt dependencies to be passed as build argument
 ARG CUSTOM_APT_DEPS=""
 
@@ -36,14 +32,6 @@ RUN if [ ! -z "$CUSTOM_APT_DEPS" ]; then \
         && rm -rf /var/lib/apt/lists/*; \
     fi
 
-# Allow custom snap dependencies to be passed as build argument
-ARG CUSTOM_SNAP_DEPS=""
-
-# Install custom snap dependencies if provided
-RUN if [ ! -z "$CUSTOM_SNAP_DEPS" ]; then \
-        snap install $CUSTOM_SNAP_DEPS; \
-    fi
-
 # Allow custom global npm packages to be passed as build argument
 ARG GLOBAL_NPM_PACKAGES=""
 

package/dist/commands/push_v2/build_docker_image.js

@@ -1,3 +1,3 @@
-import{exec as f,execSync as k}from"child_process";import n from"path";import{fileURLToPath as _}from"url";import g from"fs";const $=_(import.meta.url),c=n.dirname($),D=()=>{try{return k("docker --version",{stdio:"ignore"}),!0}catch{return!1}},P=(r="",s="",{apt_deps:l=[],snap_deps:d=[],npm_deps:a=[]}={})=>new Promise((u,i)=>{if(!D()){console.log(`
+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();return}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 p=`docker build ${[`CUSTOM_APT_DEPS=${l.join(" ")}`,`CUSTOM_SNAP_DEPS=${d.join(" ")}`,`GLOBAL_NPM_PACKAGES=${a.join(" ")}`].map(o=>`--build-arg ${o}`).join(" ")} -t ${r} -f "${e}" "${s||c}"`;f(p,(o,m,t)=>{if(o){console.error(`Error building Docker image: ${o.message}`),i(o);return}t&&console.error(`Docker build stderr: ${t}`),process.loader.print(m),process.loader.print(`Successfully built Docker image: ${r}`),u()})});var A=P;export{A as default};
+`),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};

package/package.json

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

package/src/commands/push_v2/Dockerfile

@@ -7,14 +7,13 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Set up environment variables
 ENV NODE_VERSION=20.x
 
-# Install Node.js 20, common dependencies, and snapd
+# Install Node.js 20 and common dependencies
 RUN apt-get update && apt-get install -y \
     curl \
     zip \
     unzip \
     git \
     build-essential \
-    snapd \
     && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
     && apt-get install -y nodejs \
     && apt-get clean \
@@ -23,9 +22,6 @@ RUN apt-get update && apt-get install -y \
 # Verify Node.js version
 RUN node --version
 
-# Initialize snap
-RUN snap install core
-
 # Allow custom apt dependencies to be passed as build argument
 ARG CUSTOM_APT_DEPS=""
 
@@ -36,14 +32,6 @@ RUN if [ ! -z "$CUSTOM_APT_DEPS" ]; then \
         && rm -rf /var/lib/apt/lists/*; \
     fi
 
-# Allow custom snap dependencies to be passed as build argument
-ARG CUSTOM_SNAP_DEPS=""
-
-# Install custom snap dependencies if provided
-RUN if [ ! -z "$CUSTOM_SNAP_DEPS" ]; then \
-        snap install $CUSTOM_SNAP_DEPS; \
-    fi
-
 # Allow custom global npm packages to be passed as build argument
 ARG GLOBAL_NPM_PACKAGES=""
 

package/src/commands/push_v2/build_docker_image.js

@@ -20,7 +20,6 @@ const build_docker_image = (
   context_path = '',
   {
     apt_deps = [],
-    snap_deps = [],
     npm_deps = []
   } = {}
 ) => {
@@ -29,8 +28,7 @@ const build_docker_image = (
       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');
-      process.exit();
-      return;
+      return process.exit();
     }
 
     process.loader.print('Building Docker image for deployment...');
@@ -45,7 +43,6 @@ const build_docker_image = (
     // Prepare build arguments for dependencies
     const build_args = [
       `CUSTOM_APT_DEPS=${apt_deps.join(' ')}`,
-      `CUSTOM_SNAP_DEPS=${snap_deps.join(' ')}`,
       `GLOBAL_NPM_PACKAGES=${npm_deps.join(' ')}`
     ].map(arg => `--build-arg ${arg}`).join(' ');