use --background instead of tmux (#2)

namespacelabs · Mar 15, 2023 · e14db8c · e14db8c
1 parent 0189699
commit e14db8c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1,313 deletions.
diff --git a/common.ts b/common.ts
@@ -1,7 +1,7 @@
 import * as path from "path";
 import * as fs from "fs";
 
-export const SessionId = "NscBuildkitProxySession";
+export const ProxyPidFile = tmpFile("buildkit-proxy.pid");
 
 export function tmpFile(file: string): string {
 	const tmpDir = path.join(process.env.RUNNER_TEMP, "ns");

diff --git a/dist/main/index.js b/dist/main/index.js
@@ -4322,7 +4322,7 @@ var external_fs_ = __nccwpck_require__(147);
 ;// CONCATENATED MODULE: ./common.ts
 
 
-const SessionId = "NscBuildkitProxySession";
+const ProxyPidFile = tmpFile("buildkit-proxy.pid");
 function tmpFile(file) {
     const tmpDir = external_path_.join(process.env.RUNNER_TEMP, "ns");
     if (!external_fs_.existsSync(tmpDir)) {
@@ -4361,8 +4361,8 @@ Please add a step this step to your workflow's job definition:
 function prepareBuildx() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const sock = tmpFile("buildkit.sock");
-            yield exec.exec(`tmux new-session -d -s ${SessionId} \"nsc cluster proxy --kind=buildkit --cluster=build-cluster --sock_path=${sock}\"`);
+            const sock = tmpFile("buildkit-proxy.sock");
+            yield exec.exec(`nsc cluster proxy --kind=buildkit --cluster=build-cluster --sock_path=${sock} --background=${ProxyPidFile}`);
             yield exec.exec(`docker buildx create --name remote-nsc --driver remote unix://${sock}`);
             yield exec.exec("docker buildx use remote-nsc");
         }