@joystick.js/cli-canary 0.0.0-canary.1656 → 0.0.0-canary.1657

package/dist/commands/push_v2/build_docker_image.js

@@ -1 +1 @@
-import{exec as g,execSync as $}from"child_process";import l from"path";import{fileURLToPath as b}from"url";import n from"fs";import p from"os";import D from"tar";import x from"adm-zip";import{promisify as S}from"util";import{pipeline as E}from"stream";import P from"node-fetch";const j=S(E),z=b(import.meta.url),u=l.dirname(z),a=l.join(p.homedir(),".joystick","docker"),f=()=>l.join(a,p.platform()==="win32"?"docker.exe":"docker"),A=()=>{const r=f();try{return $(`"${r}" --version`,{stdio:"ignore"}),!0}catch{return console.warn("Warning: Docker is not installed or the binary is not accessible."),!1}},T=async()=>{const r=p.platform(),s=p.arch();let t,c;if(r==="linux")t=`https://download.docker.com/linux/static/stable/${s}/docker-24.0.7.tgz`,c="docker.tgz";else if(r==="darwin")t=`https://download.docker.com/mac/static/stable/${s}/docker-24.0.7.tgz`,c="docker.tgz";else if(r==="win32")t="https://download.docker.com/win/static/stable/x86_64/docker-24.0.7.zip",c="docker.zip";else throw new Error("Unsupported operating system");n.mkdirSync(a,{recursive:!0});const o=l.join(a,c);try{process.loader.print(`Downloading Docker binary from ${t}`);const e=await P(t);if(!e.ok)throw new Error(`Unexpected response ${e.statusText}`);await j(e.body,n.createWriteStream(o)),process.loader.print("Download completed"),r==="win32"?(process.loader.print("Extracting ZIP file"),new x(o).extractAllTo(a,!0)):(process.loader.print("Extracting TAR file"),await D.x({file:o,cwd:a,strip:1})),n.unlinkSync(o),r!=="win32"&&n.chmodSync(f(),"755"),process.loader.print(`Docker binaries downloaded and extracted to ${a}`)}catch(e){throw process.loader.print(`Error: ${e.message}`),n.existsSync(o)&&(process.loader.print("Cleaning up partial download"),n.unlinkSync(o)),new Error(`Failed to download or extract Docker binary: ${e.message}`)}},U=(r="",s="",{apt_deps:t=[],snap_deps:c=[],npm_deps:o=[]}={})=>new Promise(async(e,d)=>{if(!A()){process.loader.print("Push requires Docker to be installed on your machine. Downloading...");try{await T(),process.loader.print("Docker installed!")}catch(i){d(new Error(`Failed to download Docker binary: ${i.message}`));return}}process.loader.print("Building Docker image for deployment...");const w=f(),m=l.join(u,"Dockerfile");if(!n.existsSync(m)){d(new Error(`Dockerfile not found at ${m}`));return}const h=[`CUSTOM_APT_DEPS=${t.join(" ")}`,`CUSTOM_SNAP_DEPS=${c.join(" ")}`,`GLOBAL_NPM_PACKAGES=${o.join(" ")}`].map(i=>`--build-arg ${i}`).join(" "),_=`"${w}" build ${h} -t ${r} -f "${m}" "${s||u}"`;g(_,(i,y,k)=>{if(i){console.error(`Error building Docker image: ${i.message}`),d(i);return}k&&console.error(`Docker build stderr: ${k}`),process.loader.print(y),process.loader.print(`Successfully built Docker image: ${r}`),e()})});var W=U;export{W as default};
+import{exec as y,execSync as x}from"child_process";import l from"path";import{fileURLToPath as $}from"url";import c from"fs";import p from"os";import b from"tar";import D from"adm-zip";import{promisify as S}from"util";import{pipeline as E}from"stream";import P from"node-fetch";const j=S(E),z=$(import.meta.url),u=l.dirname(z),a=l.join(p.homedir(),".joystick","docker"),f=()=>l.join(a,p.platform()==="win32"?"docker.exe":"docker"),A=()=>{const r=f();try{return x(`"${r}" --version`,{stdio:"ignore"}),!0}catch{return console.warn("Warning: Docker is not installed or the binary is not accessible."),!1}},T=async()=>{const r=p.platform(),t=p.arch();let i,s;if(r==="linux"&&t==="x64")i="https://get.docker.com/builds/Linux/x86_64/docker-latest.tgz",s="docker-latest.tgz";else if(r==="darwin"&&t==="x64")i="https://get.docker.com/builds/Darwin/x86_64/docker-latest.tgz",s="docker-latest.tgz";else if(r==="win32"&&t==="x64")i="https://get.docker.com/builds/Windows/x86_64/docker-latest.zip",s="docker-latest.zip";else throw new Error(`Unsupported platform or architecture: ${r} ${t}`);c.mkdirSync(a,{recursive:!0});const e=l.join(a,s);try{process.loader.print(`Downloading Docker binary from ${i}`);const o=await P(i);if(!o.ok)throw new Error(`Unexpected response ${o.statusText}`);await j(o.body,c.createWriteStream(e)),process.loader.print("Download completed"),r==="win32"?(process.loader.print("Extracting ZIP file"),new D(e).extractAllTo(a,!0)):(process.loader.print("Extracting TAR file"),await b.x({file:e,cwd:a,strip:1})),c.unlinkSync(e),r!=="win32"&&c.chmodSync(f(),"755"),process.loader.print(`Docker binaries downloaded and extracted to ${a}`)}catch(o){throw process.loader.print(`Error: ${o.message}`),c.existsSync(e)&&(process.loader.print("Cleaning up partial download"),c.unlinkSync(e)),new Error(`Failed to download or extract Docker binary: ${o.message}`)}},U=(r="",t="",{apt_deps:i=[],snap_deps:s=[],npm_deps:e=[]}={})=>new Promise(async(o,d)=>{if(!A()){process.loader.print("Push requires Docker to be installed on your machine. Downloading...");try{await T(),process.loader.print("Docker installed!")}catch(n){d(new Error(`Failed to download Docker binary: ${n.message}`));return}}process.loader.print("Building Docker image for deployment...");const w=f(),m=l.join(u,"Dockerfile");if(!c.existsSync(m)){d(new Error(`Dockerfile not found at ${m}`));return}const h=[`CUSTOM_APT_DEPS=${i.join(" ")}`,`CUSTOM_SNAP_DEPS=${s.join(" ")}`,`GLOBAL_NPM_PACKAGES=${e.join(" ")}`].map(n=>`--build-arg ${n}`).join(" "),_=`"${w}" build ${h} -t ${r} -f "${m}" "${t||u}"`;y(_,(n,g,k)=>{if(n){console.error(`Error building Docker image: ${n.message}`),d(n);return}k&&console.error(`Docker build stderr: ${k}`),process.loader.print(g),process.loader.print(`Successfully built Docker image: ${r}`),o()})});var R=U;export{R as default};

package/package.json

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

package/src/commands/push_v2/build_docker_image.js

@@ -37,17 +37,17 @@ const get_docker_binary = async () => {
   let url;
   let archive_name;
 
-  if (platform === 'linux') {
-    url = `https://download.docker.com/linux/static/stable/${arch}/docker-24.0.7.tgz`;
-    archive_name = 'docker.tgz';
-  } else if (platform === 'darwin') {
-    url = `https://download.docker.com/mac/static/stable/${arch}/docker-24.0.7.tgz`;
-    archive_name = 'docker.tgz';
-  } else if (platform === 'win32') {
-    url = 'https://download.docker.com/win/static/stable/x86_64/docker-24.0.7.zip';
-    archive_name = 'docker.zip';
+  if (platform === 'linux' && arch === 'x64') {
+    url = 'https://get.docker.com/builds/Linux/x86_64/docker-latest.tgz';
+    archive_name = 'docker-latest.tgz';
+  } else if (platform === 'darwin' && arch === 'x64') {
+    url = 'https://get.docker.com/builds/Darwin/x86_64/docker-latest.tgz';
+    archive_name = 'docker-latest.tgz';
+  } else if (platform === 'win32' && arch === 'x64') {
+    url = 'https://get.docker.com/builds/Windows/x86_64/docker-latest.zip';
+    archive_name = 'docker-latest.zip';
   } else {
-    throw new Error('Unsupported operating system');
+    throw new Error(`Unsupported platform or architecture: ${platform} ${arch}`);
   }
 
   fs.mkdirSync(joystick_docker_path, { recursive: true });