fission-worker 0.1.4 → 0.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/docker.d.ts +1 -0
- package/dist/docker.js +5 -3
- package/dist/docker.js.map +1 -1
- package/package.json +1 -1
package/dist/docker.d.ts
CHANGED
package/dist/docker.js
CHANGED
|
@@ -43,7 +43,7 @@ function startSession(job, config, activeSessions) {
|
|
|
43
43
|
"-e", `PROJECT_ID=${job.projectId}`,
|
|
44
44
|
"-e", `REPO_URL=${repo.repoUrl}`,
|
|
45
45
|
"-e", `REPO_BRANCH=${repo.branch || "main"}`,
|
|
46
|
-
"-e", `GITHUB_TOKEN=${config.githubToken || ""}`,
|
|
46
|
+
"-e", `GITHUB_TOKEN=${job.githubToken || config.githubToken || ""}`,
|
|
47
47
|
IMAGE,
|
|
48
48
|
];
|
|
49
49
|
(0, child_process_1.execSync)(`docker ${createArgs.join(" ")}`, { stdio: "pipe" });
|
|
@@ -52,10 +52,12 @@ function startSession(job, config, activeSessions) {
|
|
|
52
52
|
(0, child_process_1.execSync)(`docker cp "${claudePath}" ${containerName}:/usr/local/bin/claude`, { stdio: "pipe" });
|
|
53
53
|
(0, child_process_1.execSync)(`docker cp "${claudeHome}" ${containerName}:/root/.claude`, { stdio: "pipe" });
|
|
54
54
|
// Set up git credentials inside the container for private repo access
|
|
55
|
-
|
|
55
|
+
// Prefer API-provided token (from GitHub App installation) over config token
|
|
56
|
+
const gitToken = job.githubToken || config.githubToken;
|
|
57
|
+
if (gitToken) {
|
|
56
58
|
const tmpGitCreds = `/tmp/fission-git-creds-${job.sessionId.slice(0, 8)}`;
|
|
57
59
|
const tmpGitConfig = `/tmp/fission-gitconfig-${job.sessionId.slice(0, 8)}`;
|
|
58
|
-
(0, fs_1.writeFileSync)(tmpGitCreds, `https://x-access-token:${
|
|
60
|
+
(0, fs_1.writeFileSync)(tmpGitCreds, `https://x-access-token:${gitToken}@github.com\n`);
|
|
59
61
|
(0, fs_1.writeFileSync)(tmpGitConfig, `[credential]\n\thelper = store\n`);
|
|
60
62
|
(0, child_process_1.execSync)(`docker cp "${tmpGitCreds}" ${containerName}:/root/.git-credentials`, { stdio: "pipe" });
|
|
61
63
|
(0, child_process_1.execSync)(`docker cp "${tmpGitConfig}" ${containerName}:/root/.gitconfig`, { stdio: "pipe" });
|
package/dist/docker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../src/docker.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../src/docker.ts"],"names":[],"mappings":";;AAcA,oCA0GC;AAxHD,iDAA8D;AAC9D,2BAA+C;AAa/C,SAAgB,YAAY,CAC1B,GAAgB,EAChB,MAAoB,EACpB,cAAyC;IAEzC,MAAM,QAAQ,GAAG,GAAG,MAAM,CAAC,QAAQ,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;IACvD,IAAA,wBAAQ,EAAC,YAAY,QAAQ,EAAE,CAAC,CAAC;IAEjC,qCAAqC;IACrC,IAAI,UAAkB,CAAC;IACvB,IAAI,CAAC;QACH,UAAU,GAAG,IAAA,wBAAQ,EAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;IAC1D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,+CAA+C,CAAC,CAAC;QAC5F,gBAAgB,CAAC,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QAC3C,OAAO;IACT,CAAC;IACD,MAAM,UAAU,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC;IAEjD,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAClC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,8CAA8C,CAAC,CAAC;QAC3F,gBAAgB,CAAC,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QAC3C,OAAO;IACT,CAAC;IAED,MAAM,aAAa,GAAG,WAAW,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;IAC7D,MAAM,KAAK,GAAG,2CAA2C,CAAC;IAE1D,0DAA0D;IAC1D,IAAI,CAAC;QACH,IAAA,wBAAQ,EAAC,eAAe,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IACtD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,GAAG,CAAC,IAAI,aAAa,sBAAsB,CAAC,CAAC;IACvD,CAAC;IAED,IAAI,CAAC;QACH,8DAA8D;QAC9D,MAAM,UAAU,GAAG;YACjB,QAAQ;YACR,QAAQ,EAAE,aAAa;YACvB,IAAI,EAAE,mBAAmB,MAAM,CAAC,UAAU,EAAE;YAC5C,IAAI,EAAE,mBAAmB,MAAM,CAAC,MAAM,EAAE;YACxC,IAAI,EAAE,cAAc,GAAG,CAAC,SAAS,EAAE;YACnC,IAAI,EAAE,cAAc,GAAG,CAAC,SAAS,EAAE;YACnC,IAAI,EAAE,YAAY,IAAI,CAAC,OAAO,EAAE;YAChC,IAAI,EAAE,eAAe,IAAI,CAAC,MAAM,IAAI,MAAM,EAAE;YAC5C,IAAI,EAAE,gBAAgB,GAAG,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW,IAAI,EAAE,EAAE;YACnE,KAAK;SACN,CAAC;QAEF,IAAA,wBAAQ,EAAC,UAAU,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAE9D,8DAA8D;QAC9D,OAAO,CAAC,GAAG,CAAC,IAAI,aAAa,uDAAuD,CAAC,CAAC;QACtF,IAAA,wBAAQ,EAAC,cAAc,UAAU,KAAK,aAAa,wBAAwB,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAChG,IAAA,wBAAQ,EAAC,cAAc,UAAU,KAAK,aAAa,gBAAgB,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAExF,sEAAsE;QACtE,6EAA6E;QAC7E,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW,CAAC;QACvD,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,WAAW,GAAG,0BAA0B,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YAC1E,MAAM,YAAY,GAAG,0BAA0B,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YAC3E,IAAA,kBAAa,EAAC,WAAW,EAAE,0BAA0B,QAAQ,eAAe,CAAC,CAAC;YAC9E,IAAA,kBAAa,EAAC,YAAY,EAAE,kCAAkC,CAAC,CAAC;YAChE,IAAA,wBAAQ,EAAC,cAAc,WAAW,KAAK,aAAa,yBAAyB,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;YAClG,IAAA,wBAAQ,EAAC,cAAc,YAAY,KAAK,aAAa,mBAAmB,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;YAC7F,IAAA,eAAU,EAAC,WAAW,CAAC,CAAC;YACxB,IAAA,eAAU,EAAC,YAAY,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,IAAI,aAAa,iCAAiC,GAAG,EAAE,CAAC,CAAC;QACvE,IAAI,CAAC;YAAC,IAAA,wBAAQ,EAAC,gBAAgB,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QAC9E,gBAAgB,CAAC,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QAC3C,OAAO;IACT,CAAC;IAED,0BAA0B;IAC1B,MAAM,IAAI,GAAG,IAAA,qBAAK,EAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,aAAa,CAAC,EAAE;QAC3D,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;KAClC,CAAC,CAAC;IAEH,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAExC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;QACxC,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QACrC,IAAI,IAAI;YAAE,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;QACxC,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QACrC,IAAI,IAAI;YAAE,OAAO,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;QACxB,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,gCAAgC,IAAI,EAAE,CAAC,CAAC;QACjF,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAErC,oBAAoB;QACpB,IAAI,CAAC;YACH,IAAA,wBAAQ,EAAC,gBAAgB,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAC/D,CAAC;QAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;QAExB,gBAAgB,CAAC,MAAM,EAAE,GAAG,CAAC,SAAS,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAoB,EAAE,SAAiB,EAAE,QAAgB;IACjF,KAAK,CAAC,GAAG,MAAM,CAAC,UAAU,2BAA2B,SAAS,WAAW,EAAE;QACzE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,aAAa,EAAE,UAAU,MAAM,CAAC,MAAM,EAAE;YACxC,cAAc,EAAE,kBAAkB;SACnC;QACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;KACnC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;AACrB,CAAC"}
|