creevey 0.10.29 → 0.10.31
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/server/docker.d.ts +1 -1
- package/dist/server/docker.js +10 -5
- package/dist/server/docker.js.map +1 -1
- package/dist/server/playwright/docker.js +4 -0
- package/dist/server/playwright/docker.js.map +1 -1
- package/package.json +1 -1
- package/src/server/docker.ts +11 -7
- package/src/server/playwright/docker.ts +5 -0
package/dist/server/docker.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { DockerAuth } from '../types.js';
|
|
2
|
-
export declare function getDockerSocketPath(): string;
|
|
2
|
+
export declare function getDockerSocketPath(): string | undefined;
|
|
3
3
|
export declare function pullImages(images: string[], { auth, platform }?: {
|
|
4
4
|
auth?: DockerAuth;
|
|
5
5
|
platform?: string;
|
package/dist/server/docker.js
CHANGED
|
@@ -41,13 +41,12 @@ function findDockerSocket() {
|
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
43
|
// Fall back to default if no socket found
|
|
44
|
-
(0, logger_js_1.logger)().warn('No Docker socket found at known locations, using default
|
|
45
|
-
return '/var/run/docker.sock';
|
|
44
|
+
(0, logger_js_1.logger)().warn('No Docker socket found at known locations, using default');
|
|
46
45
|
}
|
|
47
46
|
const dockerSocketPath = findDockerSocket();
|
|
48
|
-
const docker = new dockerode_1.default({ socketPath: dockerSocketPath });
|
|
47
|
+
const docker = new dockerode_1.default(dockerSocketPath ? { socketPath: dockerSocketPath } : undefined);
|
|
49
48
|
function getDockerSocketPath() {
|
|
50
|
-
return dockerSocketPath;
|
|
49
|
+
return dockerSocketPath ?? '/var/run/docker.sock';
|
|
51
50
|
}
|
|
52
51
|
class DevNull extends stream_1.Writable {
|
|
53
52
|
_write(_chunk, _encoding, callback) {
|
|
@@ -179,7 +178,13 @@ async function runImage(image, args, options, debug) {
|
|
|
179
178
|
(0, context_js_1.setWorkerContainer)(container);
|
|
180
179
|
});
|
|
181
180
|
hub.once('start', (container) => void container.inspect().then((info) => {
|
|
182
|
-
|
|
181
|
+
if ('podman' in info.NetworkSettings.Networks) {
|
|
182
|
+
// NOTE: Podman uses different default network
|
|
183
|
+
resolve(info.NetworkSettings.Networks.podman.IPAddress);
|
|
184
|
+
}
|
|
185
|
+
else {
|
|
186
|
+
resolve(info.NetworkSettings.Networks.bridge.IPAddress);
|
|
187
|
+
}
|
|
183
188
|
}));
|
|
184
189
|
});
|
|
185
190
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../src/server/docker.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../src/server/docker.ts"],"names":[],"mappings":";;;;;AA4CA,kDAEC;AAQD,gCA0CC;AAED,gCA6FC;AAED,4BA2BC;AA5ND,4DAA6B;AAC7B,wDAA8B;AAC9B,mCAAkC;AAClC,0DAAiD;AACjD,2BAAgC;AAChC,2BAA6B;AAC7B,+BAA4B;AAE5B,2CAAqC;AACrC,oDAAyD;AAEzD,SAAS,gBAAgB;IACvB,gEAAgE;IAChE,MAAM,aAAa,GAAG;QACpB,0BAA0B;QAC1B,sBAAsB;QACtB,yBAAyB;QACzB,IAAA,WAAI,EAAC,IAAA,YAAO,GAAE,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,CAAC;QAChD,SAAS;QACT,IAAA,WAAI,EAAC,IAAA,YAAO,GAAE,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,CAAC;QACpD,IAAA,WAAI,EAAC,IAAA,YAAO,GAAE,EAAE,SAAS,EAAE,aAAa,CAAC;QACzC,SAAS;QACT,yBAAyB;QACzB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACpG,kBAAkB;QAClB,IAAA,WAAI,EAAC,IAAA,YAAO,GAAE,EAAE,KAAK,EAAE,aAAa,CAAC;QACrC,WAAW;QACX,IAAA,WAAI,EAAC,IAAA,YAAO,GAAE,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa,CAAC;KACnD,CAAC;IAEF,KAAK,MAAM,UAAU,IAAI,aAAa,EAAE,CAAC;QACvC,IAAI,IAAA,eAAU,EAAC,UAAU,CAAC,EAAE,CAAC;YAC3B,IAAA,kBAAM,GAAE,CAAC,KAAK,CAAC,2BAA2B,UAAU,EAAE,CAAC,CAAC;YACxD,OAAO,UAAU,CAAC;QACpB,CAAC;IACH,CAAC;IAED,0CAA0C;IAC1C,IAAA,kBAAM,GAAE,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;AAC5E,CAAC;AAED,MAAM,gBAAgB,GAAG,gBAAgB,EAAE,CAAC;AAC5C,MAAM,MAAM,GAAG,IAAI,mBAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AAE9F,SAAgB,mBAAmB;IACjC,OAAO,gBAAgB,IAAI,sBAAsB,CAAC;AACpD,CAAC;AAED,MAAM,OAAQ,SAAQ,iBAAQ;IAC5B,MAAM,CAAC,MAAe,EAAE,SAAyB,EAAE,QAAwC;QACzF,YAAY,CAAC,QAAQ,CAAC,CAAC;IACzB,CAAC;CACF;AAEM,KAAK,UAAU,UAAU,CAC9B,MAAgB,EAChB,EAAE,IAAI,EAAE,QAAQ,KAA+C,EAAE;IAEjE,MAAM,IAAI,GAA4B,EAAE,CAAC;IACzC,IAAI,IAAI;QAAE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACjC,IAAI,QAAQ;QAAE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAEvC,IAAA,kBAAM,GAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACpC,kCAAkC;IAClC,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,CAAC;IAChE,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1C,MAAM,OAAO,GAAG,YAAY,CAAC,EAAE,IAAI,EAAE,GAAG,KAAK,cAAc,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;YAEvE,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,SAAuB,EAAE,MAA8B,EAAE,EAAE;gBACnF,IAAI,SAAS,IAAI,CAAC,MAAM,EAAE,CAAC;oBACzB,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;oBAClC,MAAM,CAAC,SAAS,IAAI,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;oBAChD,OAAO;gBACT,CAAC;gBAED,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;gBAE5D,SAAS,UAAU,CAAC,KAAmB;oBACrC,IAAI,KAAK,EAAE,CAAC;wBACV,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;wBAC7B,MAAM,CAAC,KAAK,CAAC,CAAC;wBACd,OAAO;oBACT,CAAC;oBACD,OAAO,CAAC,OAAO,CAAC,GAAG,KAAK,iBAAiB,CAAC,CAAC;oBAC3C,OAAO,EAAE,CAAC;gBACZ,CAAC;gBAED,SAAS,UAAU,CAAC,KAAwD;oBAC1E,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;wBAAE,OAAO;oBAE9C,OAAO,CAAC,IAAI,GAAG,GAAG,KAAK,MAAM,KAAK,CAAC,EAAE,KAAK,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC;gBACnF,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,UAAU,CAAC,SAAiB,EAAE,OAAe,EAAE,UAAkB;IACrF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,WAAW,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAEzF,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,WAAW,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAC5G,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,OAAO,CAAC,GAAG,CACf,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YAC5B,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC/C,IAAI,CAAC;gBACH,MAAM,SAAS,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1C,CAAC;YAAC,MAAM,CAAC;gBACP,UAAU;YACZ,CAAC;QACH,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC;IAC3E,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,MAAM,OAAO,CAAC,GAAG,CACf,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YAC3B,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACvC,IAAI,CAAC;gBACH,MAAM,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YACtC,CAAC;YAAC,MAAM,CAAC;gBACP,UAAU;YACZ,CAAC;QACH,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;QACvC,IAAA,kBAAM,GAAE,CAAC,IAAI,CAAC,SAAS,SAAS,iBAAiB,CAAC,CAAC;QACnD,OAAO;IACT,CAAC;IAED,MAAM,IAAI,GAAG,oBAAG,CAAC,IAAI,EAAE,CAAC;IACxB,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,UAAU,CAAC,CAAC;IAC/C,IAAI,CAAC,QAAQ,EAAE,CAAC;IAEhB,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,YAAY,CAAC,EAAE,IAAI,EAAE,GAAG,SAAS,eAAe,EAAE,CAAC,CAAC;IACpE,IAAI,IAAA,kBAAM,GAAE,CAAC,QAAQ,EAAE,GAAG,kBAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC9C,OAAO,CAAC,KAAK,EAAE,CAAC;IAClB,CAAC;IACD,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1C,MAAM,CAAC,UAAU,CACf,IAAI;QACJ,mDAAmD;QACnD,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,EACvE,CAAC,UAAwB,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,UAAU,IAAI,CAAC,MAAM,EAAE,CAAC;gBAC1B,sCAAsC;gBACtC,MAAM,CAAC,UAAU,IAAI,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;gBACjD,OAAO;YACT,CAAC;YAED,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;YAE5D,SAAS,UAAU,CAAC,KAAmB;gBACrC,IAAI,QAAQ;oBAAE,OAAO;gBAErB,IAAI,KAAK,EAAE,CAAC;oBACV,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBAC7B,MAAM,CAAC,KAAK,CAAC,CAAC;oBACd,OAAO;gBACT,CAAC;gBACD,OAAO,CAAC,OAAO,CAAC,GAAG,SAAS,kBAAkB,CAAC,CAAC;gBAChD,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,SAAS,UAAU,CACjB,KAG+B;gBAE/B,IAAI,QAAQ,IAAI,KAAK,EAAE,CAAC;oBACtB,IAAI,IAAA,kBAAM,GAAE,CAAC,QAAQ,EAAE,IAAI,kBAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;wBAC/C,IAAA,kBAAM,GAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;oBACtC,CAAC;yBAAM,CAAC;wBACN,OAAO,CAAC,IAAI,GAAG,GAAG,SAAS,eAAe,KAAK,CAAC,MAAM,EAAE,CAAC;oBAC3D,CAAC;gBACH,CAAC;qBAAM,IAAI,aAAa,IAAI,KAAK,EAAE,CAAC;oBAClC,QAAQ,GAAG,IAAI,CAAC;oBAChB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBAC3B,MAAM,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;gBACjC,CAAC;YACH,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,QAAQ,CAC5B,KAAa,EACb,IAAc,EACd,OAAgC,EAChC,KAAc;IAEd,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,OAAO,EAAE,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QAC7F,IAAI,KAAK;YAAE,MAAM,KAAK,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,SAAoB,EAAE,EAAE;YAC7C,IAAA,+BAAkB,EAAC,SAAS,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CACN,OAAO,EACP,CAAC,SAAoB,EAAE,EAAE,CACvB,KAAK,SAAS,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YACrC,IAAI,QAAQ,IAAI,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;gBAC9C,8CAA8C;gBAC9C,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC1D,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC,CAAC,CACL,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.startPlaywrightContainer = startPlaywrightContainer;
|
|
7
7
|
const assert_1 = __importDefault(require("assert"));
|
|
8
|
+
const promises_1 = require("fs/promises");
|
|
8
9
|
const docker_1 = require("../docker");
|
|
9
10
|
const messages_1 = require("../messages");
|
|
10
11
|
const utils_1 = require("../utils");
|
|
@@ -21,6 +22,9 @@ async function startPlaywrightContainer(imageName, browser, config, debug) {
|
|
|
21
22
|
});
|
|
22
23
|
const cacheDir = await (0, utils_1.getCreeveyCache)();
|
|
23
24
|
(0, assert_1.default)(cacheDir, "Couldn't get cache directory");
|
|
25
|
+
// NOTE: Docker creates root directory if it doesn't exist, but Podman doesn't create it
|
|
26
|
+
// https://github.com/containers/podman/issues/6234
|
|
27
|
+
await (0, promises_1.mkdir)(`${cacheDir}/${process.pid}`, { recursive: true });
|
|
24
28
|
const host = await (0, docker_1.runImage)(imageName, [JSON.stringify({ ...playwrightOptions, browser: (0, utils_1.resolvePlaywrightBrowserType)(browserName) })], {
|
|
25
29
|
ExposedPorts: { [`${port}/tcp`]: {} },
|
|
26
30
|
HostConfig: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../src/server/playwright/docker.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../src/server/playwright/docker.ts"],"names":[],"mappings":";;;;;AAQA,4DA4CC;AApDD,oDAA4B;AAC5B,0CAAoC;AACpC,sCAAqC;AACrC,0CAA6D;AAC7D,oCAAyF;AACzF,4CAAgD;AAGzC,KAAK,UAAU,wBAAwB,CAC5C,SAAiB,EACjB,OAAe,EACf,MAAc,EACd,KAAc;IAEd,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAwB,CAAC;IAC3F,MAAM,IAAI,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,EAAE;QACjD,IAAA,sBAAW,EAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE;YAChC,IAAI,OAAO,CAAC,IAAI,IAAI,MAAM,EAAE,CAAC;gBAC3B,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAChC,CAAC;QACH,CAAC,CAAC,CAAC;QACH,IAAA,4BAAiB,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,MAAM,IAAA,uBAAe,GAAE,CAAC;IAEzC,IAAA,gBAAM,EAAC,QAAQ,EAAE,8BAA8B,CAAC,CAAC;IAEjD,wFAAwF;IACxF,mDAAmD;IACnD,MAAM,IAAA,gBAAK,EAAC,GAAG,QAAQ,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE/D,MAAM,IAAI,GAAG,MAAM,IAAA,iBAAQ,EACzB,SAAS,EACT,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,iBAAiB,EAAE,OAAO,EAAE,IAAA,oCAA4B,EAAC,WAAW,CAAC,EAAE,CAAC,CAAC,EAC9F;QACE,YAAY,EAAE,EAAE,CAAC,GAAG,IAAI,MAAM,CAAC,EAAE,EAAE,EAAE;QACrC,UAAU,EAAE;YACV,YAAY,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE;YACzD,KAAK,EAAE,CAAC,GAAG,QAAQ,IAAI,OAAO,CAAC,GAAG,kBAAkB,CAAC;YACrD,mEAAmE;YACnE,qCAAqC;SACtC;QACD,wFAAwF;QACxF,oFAAoF;KACrF,EACD,KAAK,CACN,CAAC;IAEF,MAAM,OAAO,GAAG,kBAAkB,IAAI,UAAU,CAAC;IAEjD,OAAO,sBAAc,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,4BAAgB,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;AAC5E,CAAC"}
|
package/package.json
CHANGED
package/src/server/docker.ts
CHANGED
|
@@ -9,7 +9,7 @@ import { DockerAuth } from '../types.js';
|
|
|
9
9
|
import { logger } from './logger.js';
|
|
10
10
|
import { setWorkerContainer } from './worker/context.js';
|
|
11
11
|
|
|
12
|
-
function findDockerSocket(): string {
|
|
12
|
+
function findDockerSocket(): string | undefined {
|
|
13
13
|
// List of possible docker.sock locations in order of preference
|
|
14
14
|
const possiblePaths = [
|
|
15
15
|
// Standard Linux location
|
|
@@ -36,15 +36,14 @@ function findDockerSocket(): string {
|
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
// Fall back to default if no socket found
|
|
39
|
-
logger().warn('No Docker socket found at known locations, using default
|
|
40
|
-
return '/var/run/docker.sock';
|
|
39
|
+
logger().warn('No Docker socket found at known locations, using default');
|
|
41
40
|
}
|
|
42
41
|
|
|
43
42
|
const dockerSocketPath = findDockerSocket();
|
|
44
|
-
const docker = new Dockerode({ socketPath: dockerSocketPath });
|
|
43
|
+
const docker = new Dockerode(dockerSocketPath ? { socketPath: dockerSocketPath } : undefined);
|
|
45
44
|
|
|
46
|
-
export function getDockerSocketPath(): string {
|
|
47
|
-
return dockerSocketPath;
|
|
45
|
+
export function getDockerSocketPath(): string | undefined {
|
|
46
|
+
return dockerSocketPath ?? '/var/run/docker.sock';
|
|
48
47
|
}
|
|
49
48
|
|
|
50
49
|
class DevNull extends Writable {
|
|
@@ -210,7 +209,12 @@ export async function runImage(
|
|
|
210
209
|
'start',
|
|
211
210
|
(container: Container) =>
|
|
212
211
|
void container.inspect().then((info) => {
|
|
213
|
-
|
|
212
|
+
if ('podman' in info.NetworkSettings.Networks) {
|
|
213
|
+
// NOTE: Podman uses different default network
|
|
214
|
+
resolve(info.NetworkSettings.Networks.podman.IPAddress);
|
|
215
|
+
} else {
|
|
216
|
+
resolve(info.NetworkSettings.Networks.bridge.IPAddress);
|
|
217
|
+
}
|
|
214
218
|
}),
|
|
215
219
|
);
|
|
216
220
|
});
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import assert from 'assert';
|
|
2
|
+
import { mkdir } from 'fs/promises';
|
|
2
3
|
import { runImage } from '../docker';
|
|
3
4
|
import { emitWorkerMessage, subscribeOn } from '../messages';
|
|
4
5
|
import { getCreeveyCache, isInsideDocker, resolvePlaywrightBrowserType } from '../utils';
|
|
@@ -25,6 +26,10 @@ export async function startPlaywrightContainer(
|
|
|
25
26
|
|
|
26
27
|
assert(cacheDir, "Couldn't get cache directory");
|
|
27
28
|
|
|
29
|
+
// NOTE: Docker creates root directory if it doesn't exist, but Podman doesn't create it
|
|
30
|
+
// https://github.com/containers/podman/issues/6234
|
|
31
|
+
await mkdir(`${cacheDir}/${process.pid}`, { recursive: true });
|
|
32
|
+
|
|
28
33
|
const host = await runImage(
|
|
29
34
|
imageName,
|
|
30
35
|
[JSON.stringify({ ...playwrightOptions, browser: resolvePlaywrightBrowserType(browserName) })],
|