@theia/dev-container 1.58.2 → 1.59.0-next.62
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/lib/electron-browser/container-connection-contribution.d.ts +1 -1
- package/lib/electron-browser/container-connection-contribution.d.ts.map +1 -1
- package/lib/electron-browser/container-connection-contribution.js +4 -4
- package/lib/electron-browser/container-connection-contribution.js.map +1 -1
- package/lib/electron-common/remote-container-connection-provider.d.ts +1 -1
- package/lib/electron-common/remote-container-connection-provider.d.ts.map +1 -1
- package/lib/electron-node/dev-container-backend-module.d.ts.map +1 -1
- package/lib/electron-node/dev-container-backend-module.js +3 -0
- package/lib/electron-node/dev-container-backend-module.js.map +1 -1
- package/lib/electron-node/dev-container-file-service.d.ts +5 -0
- package/lib/electron-node/dev-container-file-service.d.ts.map +1 -1
- package/lib/electron-node/dev-container-file-service.js +37 -1
- package/lib/electron-node/dev-container-file-service.js.map +1 -1
- package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.d.ts +3 -0
- package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.d.ts.map +1 -1
- package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.js +18 -1
- package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.js.map +1 -1
- package/lib/electron-node/devcontainer-contributions/variable-resolver-contribution.d.ts +18 -0
- package/lib/electron-node/devcontainer-contributions/variable-resolver-contribution.d.ts.map +1 -0
- package/lib/electron-node/devcontainer-contributions/variable-resolver-contribution.js +58 -0
- package/lib/electron-node/devcontainer-contributions/variable-resolver-contribution.js.map +1 -0
- package/lib/electron-node/docker-container-service.d.ts +1 -0
- package/lib/electron-node/docker-container-service.d.ts.map +1 -1
- package/lib/electron-node/docker-container-service.js +2 -1
- package/lib/electron-node/docker-container-service.js.map +1 -1
- package/package.json +7 -7
- package/src/electron-browser/container-connection-contribution.ts +4 -4
- package/src/electron-common/remote-container-connection-provider.ts +1 -1
- package/src/electron-node/dev-container-backend-module.ts +3 -0
- package/src/electron-node/dev-container-file-service.ts +38 -3
- package/src/electron-node/devcontainer-contributions/main-container-creation-contributions.ts +15 -0
- package/src/electron-node/devcontainer-contributions/variable-resolver-contribution.ts +54 -0
- package/src/electron-node/docker-container-service.ts +4 -1
|
@@ -22,7 +22,7 @@ export declare class ContainerConnectionContribution extends AbstractRemoteRegis
|
|
|
22
22
|
openWorkspace(uri: URI, options?: WorkspaceInput | undefined): Promise<void>;
|
|
23
23
|
getWorkspaceLabel(uri: URI): Promise<string | undefined>;
|
|
24
24
|
openInContainer(): Promise<void>;
|
|
25
|
-
doOpenInContainer(devcontainerFile: DevContainerFile,
|
|
25
|
+
doOpenInContainer(devcontainerFile: DevContainerFile, workspacePath?: string): Promise<void>;
|
|
26
26
|
getOrSelectDevcontainerFile(): Promise<DevContainerFile | undefined>;
|
|
27
27
|
}
|
|
28
28
|
//# sourceMappingURL=container-connection-contribution.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container-connection-contribution.d.ts","sourceRoot":"","sources":["../../src/electron-browser/container-connection-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,kCAAkC,EAAE,cAAc,EAAE,MAAM,iEAAiE,CAAC;AACrI,OAAO,EAAE,gBAAgB,EAAqB,iCAAiC,EAAE,MAAM,yDAAyD,CAAC;AACjJ,OAAO,EAAE,iBAAiB,EAAE,MAAM,uDAAuD,CAAC;AAC1F,OAAO,EAAE,uBAAuB,EAAE,MAAM,wDAAwD,CAAC;AACjG,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,gCAAgC,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AACpI,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAG9D,yBAAiB,uBAAuB,CAAC;IAC9B,MAAM,mBAAmB,SAIC,CAAC;CACrC;AAGD,qBACa,+BAAgC,SAAQ,kCAAmC,YAAW,gCAAgC;IAG/H,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,iCAAiC,CAAC;IAGzE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAGpE,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAEpE,sBAAsB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAMtD,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC;IAIpC,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB5E,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAUxD,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"container-connection-contribution.d.ts","sourceRoot":"","sources":["../../src/electron-browser/container-connection-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,kCAAkC,EAAE,cAAc,EAAE,MAAM,iEAAiE,CAAC;AACrI,OAAO,EAAE,gBAAgB,EAAqB,iCAAiC,EAAE,MAAM,yDAAyD,CAAC;AACjJ,OAAO,EAAE,iBAAiB,EAAE,MAAM,uDAAuD,CAAC;AAC1F,OAAO,EAAE,uBAAuB,EAAE,MAAM,wDAAwD,CAAC;AACjG,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,gCAAgC,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AACpI,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAG9D,yBAAiB,uBAAuB,CAAC;IAC9B,MAAM,mBAAmB,SAIC,CAAC;CACrC;AAGD,qBACa,+BAAgC,SAAQ,kCAAmC,YAAW,gCAAgC;IAG/H,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,iCAAiC,CAAC;IAGzE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAGpE,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAEpE,sBAAsB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAMtD,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC;IAIpC,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB5E,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAUxD,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB5F,2BAA2B,IAAI,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;CAqB7E"}
|
|
@@ -55,7 +55,7 @@ let ContainerConnectionContribution = class ContainerConnectionContribution exte
|
|
|
55
55
|
if (!devcontainerFile) {
|
|
56
56
|
throw new Error(`Devcontainer file at ${filePath} not found in workspace`);
|
|
57
57
|
}
|
|
58
|
-
return this.doOpenInContainer(devcontainerFile, uri.toString());
|
|
58
|
+
return this.doOpenInContainer(devcontainerFile, uri.path.toString());
|
|
59
59
|
}
|
|
60
60
|
async getWorkspaceLabel(uri) {
|
|
61
61
|
const containerFilePath = new URLSearchParams(uri.query).get(dev_container_workspaces_1.DEV_CONTAINER_PATH_QUERY);
|
|
@@ -74,7 +74,7 @@ let ContainerConnectionContribution = class ContainerConnectionContribution exte
|
|
|
74
74
|
}
|
|
75
75
|
this.doOpenInContainer(devcontainerFile);
|
|
76
76
|
}
|
|
77
|
-
async doOpenInContainer(devcontainerFile,
|
|
77
|
+
async doOpenInContainer(devcontainerFile, workspacePath) {
|
|
78
78
|
var _a;
|
|
79
79
|
const lastContainerInfoKey = `${LAST_USED_CONTAINER}:${devcontainerFile.path}`;
|
|
80
80
|
const lastContainerInfo = await this.workspaceStorageService.getData(lastContainerInfoKey);
|
|
@@ -83,13 +83,13 @@ let ContainerConnectionContribution = class ContainerConnectionContribution exte
|
|
|
83
83
|
nodeDownloadTemplate: this.remotePreferences['remote.nodeDownloadTemplate'],
|
|
84
84
|
lastContainerInfo,
|
|
85
85
|
devcontainerFile: devcontainerFile.path,
|
|
86
|
-
|
|
86
|
+
workspacePath: workspacePath
|
|
87
87
|
});
|
|
88
88
|
this.workspaceStorageService.setData(lastContainerInfoKey, {
|
|
89
89
|
id: connectionResult.containerId,
|
|
90
90
|
lastUsed: Date.now()
|
|
91
91
|
});
|
|
92
|
-
this.workspaceServer.setMostRecentlyUsedWorkspace(`${dev_container_workspaces_1.DEV_CONTAINER_WORKSPACE_SCHEME}:${(_a = this.workspaceService.workspace) === null || _a === void 0 ? void 0 : _a.resource.path}?${dev_container_workspaces_1.DEV_CONTAINER_PATH_QUERY}=${devcontainerFile.path}`);
|
|
92
|
+
this.workspaceServer.setMostRecentlyUsedWorkspace(`${dev_container_workspaces_1.DEV_CONTAINER_WORKSPACE_SCHEME}:${workspacePath !== null && workspacePath !== void 0 ? workspacePath : (_a = this.workspaceService.workspace) === null || _a === void 0 ? void 0 : _a.resource.path}?${dev_container_workspaces_1.DEV_CONTAINER_PATH_QUERY}=${devcontainerFile.path}`);
|
|
93
93
|
this.openRemote(connectionResult.port, false, connectionResult.workspacePath);
|
|
94
94
|
}
|
|
95
95
|
async getOrSelectDevcontainerFile() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container-connection-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/container-connection-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAkE;AAClE,kHAAqI;AACrI,kHAAiJ;AACjJ,8FAA0F;AAC1F,sGAAiG;AACjG,sCAA4E;AAC5E,sFAAoI;AACpI,2EAAsE;AACtE,wDAA8D;AAC9D,0FAAuH;AAEvH,IAAiB,uBAAuB,CAMvC;AAND,WAAiB,uBAAuB;IACvB,2CAAmB,GAAG,cAAO,CAAC,kBAAkB,CAAC;QAC1D,EAAE,EAAE,mCAAmC;QACvC,KAAK,EAAE,qBAAqB;QAC5B,QAAQ,EAAE,eAAe;KAC5B,EAAE,6BAA6B,CAAC,CAAC;AACtC,CAAC,EANgB,uBAAuB,uCAAvB,uBAAuB,QAMvC;AAED,MAAM,mBAAmB,GAAG,mBAAmB,CAAC;AAEzC,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,iEAAkC;IAuBnF,sBAAsB,CAAC,QAAwB;QAC3C,QAAQ,CAAC,eAAe,CAAC,uBAAuB,CAAC,mBAAmB,EAAE;YAClE,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE;SACxC,CAAC,CAAC;IACP,CAAC;IAED,SAAS,CAAC,GAAQ;QACd,OAAO,GAAG,CAAC,MAAM,KAAK,yDAA8B,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAQ,EAAE,OAAoC;QAC9D,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,mDAAwB,CAAC,CAAC;QAE9E,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QACpE,CAAC;QAED,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClG,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;QAEhF,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,yBAAyB,CAAC,CAAC;QAC/E,CAAC;QAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"container-connection-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/container-connection-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAkE;AAClE,kHAAqI;AACrI,kHAAiJ;AACjJ,8FAA0F;AAC1F,sGAAiG;AACjG,sCAA4E;AAC5E,sFAAoI;AACpI,2EAAsE;AACtE,wDAA8D;AAC9D,0FAAuH;AAEvH,IAAiB,uBAAuB,CAMvC;AAND,WAAiB,uBAAuB;IACvB,2CAAmB,GAAG,cAAO,CAAC,kBAAkB,CAAC;QAC1D,EAAE,EAAE,mCAAmC;QACvC,KAAK,EAAE,qBAAqB;QAC5B,QAAQ,EAAE,eAAe;KAC5B,EAAE,6BAA6B,CAAC,CAAC;AACtC,CAAC,EANgB,uBAAuB,uCAAvB,uBAAuB,QAMvC;AAED,MAAM,mBAAmB,GAAG,mBAAmB,CAAC;AAEzC,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,iEAAkC;IAuBnF,sBAAsB,CAAC,QAAwB;QAC3C,QAAQ,CAAC,eAAe,CAAC,uBAAuB,CAAC,mBAAmB,EAAE;YAClE,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE;SACxC,CAAC,CAAC;IACP,CAAC;IAED,SAAS,CAAC,GAAQ;QACd,OAAO,GAAG,CAAC,MAAM,KAAK,yDAA8B,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAQ,EAAE,OAAoC;QAC9D,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,mDAAwB,CAAC,CAAC;QAE9E,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QACpE,CAAC;QAED,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClG,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;QAEhF,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,yBAAyB,CAAC,CAAC;QAC/E,CAAC;QAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,GAAQ;QAC5B,MAAM,iBAAiB,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,mDAAwB,CAAC,CAAC;QACvF,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACrB,OAAO;QACX,CAAC;QAAA,CAAC;QACF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACtF,MAAM,gBAAgB,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,iBAAiB,CAAC,CAAC;QAC7E,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,oBAAoB,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,IAAI,GAAG,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,eAAe;QACjB,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAClE,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACpB,OAAO;QACX,CAAC;QACD,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,gBAAkC,EAAE,aAAsB;;QAC9E,MAAM,oBAAoB,GAAG,GAAG,mBAAmB,IAAI,gBAAgB,CAAC,IAAI,EAAE,CAAC;QAC/E,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAgC,oBAAoB,CAAC,CAAC;QAE1H,IAAI,CAAC,uBAAuB,CAAC,WAAW,EAAE,CAAC;QAE3C,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,CAAC;YACtE,oBAAoB,EAAE,IAAI,CAAC,iBAAiB,CAAC,6BAA6B,CAAC;YAC3E,iBAAiB;YACjB,gBAAgB,EAAE,gBAAgB,CAAC,IAAI;YACvC,aAAa,EAAE,aAAa;SAC/B,CAAC,CAAC;QAEH,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAoB,oBAAoB,EAAE;YAC1E,EAAE,EAAE,gBAAgB,CAAC,WAAW;YAChC,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,eAAe,CAAC,4BAA4B,CAC7C,GAAG,yDAA8B,IAAI,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,MAAA,IAAI,CAAC,gBAAgB,CAAC,SAAS,0CAAE,QAAQ,CAAC,IAAI,IAAI,mDAAwB,IAAI,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;QAEjK,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAClF,CAAC;IAED,KAAK,CAAC,2BAA2B;;QAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC;QAClD,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,OAAO;QACX,CAAC;QACD,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEjH,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC;QAED,OAAO,MAAA,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACrE,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,IAAI,CAAC,IAAI;YAChB,WAAW,EAAE,IAAI,CAAC,IAAI;YACtB,IAAI,EAAE,IAAI;SACb,CAAC,CAAC,EAAE;YACD,KAAK,EAAE,iCAAiC;SAC3C,CAAC,CAAC,0CAAE,IAAI,CAAC;IACd,CAAC;CAEJ,CAAA;AAjHY,0EAA+B;AAGrB;IADlB,IAAA,kBAAM,EAAC,wEAAiC,CAAC;;2EAC+B;AAGtD;IADlB,IAAA,kBAAM,EAAC,sCAAiB,CAAC;;0EAC8B;AAGrC;IADlB,IAAA,kBAAM,EAAC,mDAAuB,CAAC;sCACY,mDAAuB;gFAAC;AAGjD;IADlB,IAAA,kBAAM,EAAC,oCAAgB,CAAC;sCACY,oCAAgB;yEAAC;AAGnC;IADlB,IAAA,kBAAM,EAAC,wBAAe,CAAC;;wEAC4B;AAGjC;IADlB,IAAA,kBAAM,EAAC,wBAAiB,CAAC;;0EAC8B;AAGrC;IADlB,IAAA,kBAAM,EAAC,mDAAuB,CAAC;sCACY,mDAAuB;gFAAC;0CArB3D,+BAA+B;IAD3C,IAAA,sBAAU,GAAE;GACA,+BAA+B,CAiH3C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-container-connection-provider.d.ts","sourceRoot":"","sources":["../../src/electron-common/remote-container-connection-provider.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAGtD,eAAO,MAAM,qCAAqC,sBAAsB,CAAC;AAEzE,eAAO,MAAM,iCAAiC,eAA8C,CAAC;AAE7F,MAAM,WAAW,0BAA0B;IACvC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IACrC,gBAAgB,EAAE,MAAM,CAAC;IACzB,
|
|
1
|
+
{"version":3,"file":"remote-container-connection-provider.d.ts","sourceRoot":"","sources":["../../src/electron-common/remote-container-connection-provider.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAGtD,eAAO,MAAM,qCAAqC,sBAAsB,CAAC;AAEzE,eAAO,MAAM,iCAAiC,eAA8C,CAAC;AAE7F,MAAM,WAAW,0BAA0B;IACvC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IACrC,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAiB;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,yBAAyB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iCAAkC,SAAQ,SAAS,CAAC,uBAAuB,CAAC;IACzF,kBAAkB,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAC5F,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;IACzE,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAAC;CACpF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-container-backend-module.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-backend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"dev-container-backend-module.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-backend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAgB/D,eAAO,MAAM,sBAAsB,iBAkBjC,CAAC;;AAEH,wBAaG"}
|
|
@@ -29,10 +29,13 @@ const remote_cli_contribution_1 = require("@theia/core/lib/node/remote/remote-cl
|
|
|
29
29
|
const profile_file_modification_contribution_1 = require("./devcontainer-contributions/profile-file-modification-contribution");
|
|
30
30
|
const dev_container_workspace_handler_1 = require("./dev-container-workspace-handler");
|
|
31
31
|
const default_workspace_server_1 = require("@theia/workspace/lib/node/default-workspace-server");
|
|
32
|
+
const variable_resolver_contribution_1 = require("./devcontainer-contributions/variable-resolver-contribution");
|
|
32
33
|
exports.remoteConnectionModule = connection_container_module_1.ConnectionContainerModule.create(({ bind, bindBackendService }) => {
|
|
33
34
|
(0, core_1.bindContributionProvider)(bind, docker_container_service_1.ContainerCreationContribution);
|
|
34
35
|
(0, main_container_creation_contributions_1.registerContainerCreationContributions)(bind);
|
|
35
36
|
(0, cli_enhancing_creation_contributions_1.registerTheiaStartOptionsContributions)(bind);
|
|
37
|
+
(0, core_1.bindContributionProvider)(bind, variable_resolver_contribution_1.VariableResolverContribution);
|
|
38
|
+
(0, variable_resolver_contribution_1.registerVariableResolverContributions)(bind);
|
|
36
39
|
bind(profile_file_modification_contribution_1.ProfileFileModificationContribution).toSelf().inSingletonScope();
|
|
37
40
|
bind(docker_container_service_1.ContainerCreationContribution).toService(profile_file_modification_contribution_1.ProfileFileModificationContribution);
|
|
38
41
|
bind(remote_container_connection_provider_1.DevContainerConnectionProvider).toSelf().inSingletonScope();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-container-backend-module.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-backend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,4DAA+D;AAC/D,4GAAuG;AACvG,iGAAwF;AACxF,kHAAmJ;AACnJ,yEAAmG;AACnG,sCAAgG;AAChG,8HAA4H;AAC5H,6EAAuE;AAEvE,4HAAyK;AACzK,iGAA4F;AAC5F,gIAA0H;AAC1H,uFAAiF;AACjF,iGAAkG;
|
|
1
|
+
{"version":3,"file":"dev-container-backend-module.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-backend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,4DAA+D;AAC/D,4GAAuG;AACvG,iGAAwF;AACxF,kHAAmJ;AACnJ,yEAAmG;AACnG,sCAAgG;AAChG,8HAA4H;AAC5H,6EAAuE;AAEvE,4HAAyK;AACzK,iGAA4F;AAC5F,gIAA0H;AAC1H,uFAAiF;AACjF,iGAAkG;AAClG,gHAAkJ;AAErI,QAAA,sBAAsB,GAAG,uDAAyB,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,EAAE,EAAE;IACpG,IAAA,+BAAwB,EAAC,IAAI,EAAE,wDAA6B,CAAC,CAAC;IAC9D,IAAA,8EAAsC,EAAC,IAAI,CAAC,CAAC;IAC7C,IAAA,6EAAsC,EAAC,IAAI,CAAC,CAAC;IAC7C,IAAA,+BAAwB,EAAC,IAAI,EAAE,6DAA4B,CAAC,CAAC;IAC7D,IAAA,sEAAqC,EAAC,IAAI,CAAC,CAAC;IAC5C,IAAI,CAAC,4EAAmC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACtE,IAAI,CAAC,wDAA6B,CAAC,CAAC,SAAS,CAAC,4EAAmC,CAAC,CAAC;IAEnF,IAAI,CAAC,qEAA8B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACjE,IAAI,CAAC,wEAAiC,CAAC,CAAC,SAAS,CAAC,qEAA8B,CAAC,CAAC;IAClF,IAAI,CAAC,wBAAiB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CACzC,IAAI,2BAAoB,CAA0B,4EAAqC,EAAE,MAAM,CAAC,EAAE;QAC9F,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAoC,wEAAiC,CAAC,CAAC;QACvG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACzB,MAAM,CAAC,oBAAoB,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QACpD,OAAO,MAAM,CAAC;IAClB,CAAC,CAAC,CAAC,CAAC;AACZ,CAAC,CAAC,CAAC;AAEH,kBAAe,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IACjE,IAAI,CAAC,iDAAsB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACzD,IAAI,CAAC,uDAAyB,CAAC,CAAC,eAAe,CAAC,8BAAsB,CAAC,CAAC;IAExE,IAAI,CAAC,oDAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAE1D,IAAI,CAAC,6DAAsB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACzD,IAAI,CAAC,2DAAoB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACvD,IAAI,CAAC,+CAAqB,CAAC,CAAC,SAAS,CAAC,6DAAsB,CAAC,CAAC;IAC9D,IAAI,CAAC,+CAAqB,CAAC,CAAC,SAAS,CAAC,2DAAoB,CAAC,CAAC;IAE5D,IAAI,CAAC,8DAA4B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC/D,IAAI,CAAC,uDAA4B,CAAC,CAAC,SAAS,CAAC,8DAA4B,CAAC,CAAC;AAC/E,CAAC,CAAC,CAAC"}
|
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
import { WorkspaceServer } from '@theia/workspace/lib/common';
|
|
2
2
|
import { DevContainerFile } from '../electron-common/remote-container-connection-provider';
|
|
3
3
|
import { DevContainerConfiguration } from './devcontainer-file';
|
|
4
|
+
import { ContributionProvider } from '@theia/core';
|
|
5
|
+
import { VariableResolverContribution } from './devcontainer-contributions/variable-resolver-contribution';
|
|
4
6
|
export declare class DevContainerFileService {
|
|
5
7
|
protected readonly workspaceServer: WorkspaceServer;
|
|
8
|
+
protected readonly variableResolverContributions: ContributionProvider<VariableResolverContribution>;
|
|
9
|
+
protected resolveVariable(value: string): string;
|
|
10
|
+
protected resolveVariablesRecursively<T>(obj: T): T;
|
|
6
11
|
getConfiguration(path: string): Promise<DevContainerConfiguration>;
|
|
7
12
|
getAvailableFiles(workspace: string): Promise<DevContainerFile[]>;
|
|
8
13
|
protected searchForDevontainerJsonFiles(directory: string, depth: number): Promise<string[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-container-file-service.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-file-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yDAAyD,CAAC;AAC3F,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"dev-container-file-service.d.ts","sourceRoot":"","sources":["../../src/electron-node/dev-container-file-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,yDAAyD,CAAC;AAC3F,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAGhE,OAAO,EAAE,oBAAoB,EAAa,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,6DAA6D,CAAC;AAI3G,qBACa,uBAAuB;IAGhC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,6BAA6B,EAAE,oBAAoB,CAAC,4BAA4B,CAAC,CAAC;IAErG,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAahD,SAAS,CAAC,2BAA2B,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC;IAe7C,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAWlE,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;cAUvD,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAgBrG"}
|
|
@@ -22,12 +22,43 @@ const common_1 = require("@theia/workspace/lib/common");
|
|
|
22
22
|
const jsonc_parser_1 = require("jsonc-parser");
|
|
23
23
|
const fs = require("@theia/core/shared/fs-extra");
|
|
24
24
|
const core_1 = require("@theia/core");
|
|
25
|
+
const variable_resolver_contribution_1 = require("./devcontainer-contributions/variable-resolver-contribution");
|
|
26
|
+
const VARIABLE_REGEX = /^\$\{(.+?)(?::(.+))?\}$/;
|
|
25
27
|
let DevContainerFileService = class DevContainerFileService {
|
|
28
|
+
resolveVariable(value) {
|
|
29
|
+
const match = value.match(VARIABLE_REGEX);
|
|
30
|
+
if (match) {
|
|
31
|
+
const [, type, variable] = match;
|
|
32
|
+
for (const contribution of this.variableResolverContributions.getContributions()) {
|
|
33
|
+
if (contribution.canResolve(type)) {
|
|
34
|
+
return contribution.resolve(variable !== null && variable !== void 0 ? variable : type);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
return value;
|
|
39
|
+
}
|
|
40
|
+
resolveVariablesRecursively(obj) {
|
|
41
|
+
if (typeof obj === 'string') {
|
|
42
|
+
return this.resolveVariable(obj);
|
|
43
|
+
}
|
|
44
|
+
else if (Array.isArray(obj)) {
|
|
45
|
+
return obj.map(item => this.resolveVariablesRecursively(item));
|
|
46
|
+
}
|
|
47
|
+
else if (obj && typeof obj === 'object') {
|
|
48
|
+
const newObj = {};
|
|
49
|
+
for (const [key, value] of Object.entries(obj)) {
|
|
50
|
+
newObj[key] = this.resolveVariablesRecursively(value);
|
|
51
|
+
}
|
|
52
|
+
return newObj;
|
|
53
|
+
}
|
|
54
|
+
return obj;
|
|
55
|
+
}
|
|
26
56
|
async getConfiguration(path) {
|
|
27
|
-
|
|
57
|
+
let configuration = (0, jsonc_parser_1.parse)(await fs.readFile(path, 'utf-8').catch(() => '0'));
|
|
28
58
|
if (!configuration) {
|
|
29
59
|
throw new Error(`devcontainer file ${path} could not be parsed`);
|
|
30
60
|
}
|
|
61
|
+
configuration = this.resolveVariablesRecursively(configuration);
|
|
31
62
|
configuration.location = path;
|
|
32
63
|
return configuration;
|
|
33
64
|
}
|
|
@@ -63,6 +94,11 @@ tslib_1.__decorate([
|
|
|
63
94
|
(0, inversify_1.inject)(common_1.WorkspaceServer),
|
|
64
95
|
tslib_1.__metadata("design:type", Object)
|
|
65
96
|
], DevContainerFileService.prototype, "workspaceServer", void 0);
|
|
97
|
+
tslib_1.__decorate([
|
|
98
|
+
(0, inversify_1.inject)(core_1.ContributionProvider),
|
|
99
|
+
(0, inversify_1.named)(variable_resolver_contribution_1.VariableResolverContribution),
|
|
100
|
+
tslib_1.__metadata("design:type", Object)
|
|
101
|
+
], DevContainerFileService.prototype, "variableResolverContributions", void 0);
|
|
66
102
|
exports.DevContainerFileService = DevContainerFileService = tslib_1.__decorate([
|
|
67
103
|
(0, inversify_1.injectable)()
|
|
68
104
|
], DevContainerFileService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-container-file-service.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-file-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,
|
|
1
|
+
{"version":3,"file":"dev-container-file-service.js","sourceRoot":"","sources":["../../src/electron-node/dev-container-file-service.ts"],"names":[],"mappings":"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"}
|
package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.d.ts
CHANGED
|
@@ -26,6 +26,9 @@ export declare class RemoteUserContribution implements ContainerCreationContribu
|
|
|
26
26
|
export declare class PostCreateCommandContribution implements ContainerCreationContribution {
|
|
27
27
|
handlePostCreate?(containerConfig: DevContainerConfiguration, container: Docker.Container, api: Docker, outputprovider: ContainerOutputProvider): Promise<void>;
|
|
28
28
|
}
|
|
29
|
+
export declare class ContainerEnvContribution implements ContainerCreationContribution {
|
|
30
|
+
handleContainerCreation(createOptions: Docker.ContainerCreateOptions, containerConfig: DevContainerConfiguration): Promise<void>;
|
|
31
|
+
}
|
|
29
32
|
export declare namespace OutputHelper {
|
|
30
33
|
interface Progress {
|
|
31
34
|
id?: string;
|
package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main-container-creation-contributions.d.ts","sourceRoot":"","sources":["../../../src/electron-node/devcontainer-contributions/main-container-creation-contributions.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,MAAM,MAAM,WAAW,CAAC;AACpC,OAAO,EAAsB,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC9E,OAAO,EAAE,6BAA6B,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,cAAc,EAA2B,MAAM,sBAAsB,CAAC;AAE/H,OAAO,EAAE,uBAAuB,EAAE,MAAM,iDAAiD,CAAC;AAE1F,OAAO,EAAE,4BAA4B,EAAE,MAAM,mEAAmE,CAAC;AACjH,OAAO,EAAE,+BAA+B,EAAE,MAAM,yCAAyC,CAAC;AAE1F,wBAAgB,sCAAsC,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"main-container-creation-contributions.d.ts","sourceRoot":"","sources":["../../../src/electron-node/devcontainer-contributions/main-container-creation-contributions.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,MAAM,MAAM,WAAW,CAAC;AACpC,OAAO,EAAsB,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC9E,OAAO,EAAE,6BAA6B,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,cAAc,EAA2B,MAAM,sBAAsB,CAAC;AAE/H,OAAO,EAAE,uBAAuB,EAAE,MAAM,iDAAiD,CAAC;AAE1F,OAAO,EAAE,4BAA4B,EAAE,MAAM,mEAAmE,CAAC;AACjH,OAAO,EAAE,+BAA+B,EAAE,MAAM,yCAAyC,CAAC;AAE1F,wBAAgB,sCAAsC,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAQlF;AAED,qBACa,qBAAsB,YAAW,6BAA6B;IACjE,uBAAuB,CAAC,aAAa,EAAE,MAAM,CAAC,sBAAsB,EAAE,eAAe,EAAE,cAAc,EACvG,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAmB3E;AAED,qBACa,sBAAuB,YAAW,6BAA6B;IAClE,uBAAuB,CAAC,aAAa,EAAE,MAAM,CAAC,sBAAsB,EAAE,eAAe,EAAE,mBAAmB,EAC5G,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAmC3E;AAED,qBACa,wBAAyB,YAAW,6BAA6B;IAG1E,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,4BAA4B,CAAC;IAElE,iBAAiB,CAAC,eAAe,EAAE,yBAAyB,EAAE,UAAU,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC;CAqBlI;AAED,qBACa,kBAAmB,YAAW,6BAA6B;IAC9D,uBAAuB,CAAC,aAAa,EAAE,MAAM,CAAC,sBAAsB,EAAE,eAAe,EAAE,yBAAyB,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWnJ,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,aAAa;CAQxD;AAED,qBACa,sBAAuB,YAAW,6BAA6B;IAClE,uBAAuB,CAAC,aAAa,EAAE,MAAM,CAAC,sBAAsB,EAAE,eAAe,EAAE,yBAAyB,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAKtJ;AAED,qBACa,6BAA8B,YAAW,6BAA6B;IACzE,gBAAgB,CAAC,CAAC,eAAe,EAAE,yBAAyB,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;CAqBxK;AAED,qBACa,wBAAyB,YAAW,6BAA6B;IACpE,uBAAuB,CAAC,aAAa,EAAE,MAAM,CAAC,sBAAsB,EAAE,eAAe,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;CAUzI;AAED,yBAAiB,YAAY,CAAC;IAC1B,UAAiB,QAAQ;QACrB,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACrB;IAED,SAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAExD;CACJ"}
|
package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.OutputHelper = exports.PostCreateCommandContribution = exports.RemoteUserContribution = exports.MountsContribution = exports.ForwardPortsContribution = exports.DockerFileContribution = exports.ImageFileContribution = exports.registerContainerCreationContributions = void 0;
|
|
3
|
+
exports.OutputHelper = exports.ContainerEnvContribution = exports.PostCreateCommandContribution = exports.RemoteUserContribution = exports.MountsContribution = exports.ForwardPortsContribution = exports.DockerFileContribution = exports.ImageFileContribution = exports.registerContainerCreationContributions = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
6
6
|
const docker_container_service_1 = require("../docker-container-service");
|
|
@@ -14,6 +14,7 @@ function registerContainerCreationContributions(bind) {
|
|
|
14
14
|
bind(docker_container_service_1.ContainerCreationContribution).to(MountsContribution).inSingletonScope();
|
|
15
15
|
bind(docker_container_service_1.ContainerCreationContribution).to(RemoteUserContribution).inSingletonScope();
|
|
16
16
|
bind(docker_container_service_1.ContainerCreationContribution).to(PostCreateCommandContribution).inSingletonScope();
|
|
17
|
+
bind(docker_container_service_1.ContainerCreationContribution).to(ContainerEnvContribution).inSingletonScope();
|
|
17
18
|
}
|
|
18
19
|
exports.registerContainerCreationContributions = registerContainerCreationContributions;
|
|
19
20
|
let ImageFileContribution = class ImageFileContribution {
|
|
@@ -181,6 +182,22 @@ exports.PostCreateCommandContribution = PostCreateCommandContribution;
|
|
|
181
182
|
exports.PostCreateCommandContribution = PostCreateCommandContribution = tslib_1.__decorate([
|
|
182
183
|
(0, inversify_1.injectable)()
|
|
183
184
|
], PostCreateCommandContribution);
|
|
185
|
+
let ContainerEnvContribution = class ContainerEnvContribution {
|
|
186
|
+
async handleContainerCreation(createOptions, containerConfig) {
|
|
187
|
+
if (containerConfig.containerEnv) {
|
|
188
|
+
if (createOptions.Env === undefined) {
|
|
189
|
+
createOptions.Env = [];
|
|
190
|
+
}
|
|
191
|
+
for (const [key, value] of Object.entries(containerConfig.containerEnv)) {
|
|
192
|
+
createOptions.Env.push(`${key}=${value}`);
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
};
|
|
197
|
+
exports.ContainerEnvContribution = ContainerEnvContribution;
|
|
198
|
+
exports.ContainerEnvContribution = ContainerEnvContribution = tslib_1.__decorate([
|
|
199
|
+
(0, inversify_1.injectable)()
|
|
200
|
+
], ContainerEnvContribution);
|
|
184
201
|
var OutputHelper;
|
|
185
202
|
(function (OutputHelper) {
|
|
186
203
|
function parseProgress(progress) {
|
package/lib/electron-node/devcontainer-contributions/main-container-creation-contributions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main-container-creation-contributions.js","sourceRoot":"","sources":["../../../src/electron-node/devcontainer-contributions/main-container-creation-contributions.ts"],"names":[],"mappings":";;;;AAgBA,4DAA8E;AAC9E,0EAA4E;AAE5E,sCAAmC;AAEnC,kDAAkD;AAClD,uHAAiH;AAGjH,SAAgB,sCAAsC,CAAC,IAAqB;IACxE,IAAI,CAAC,wDAA6B,CAAC,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACjF,IAAI,CAAC,wDAA6B,CAAC,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAClF,IAAI,CAAC,wDAA6B,CAAC,CAAC,EAAE,CAAC,wBAAwB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpF,IAAI,CAAC,wDAA6B,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC9E,IAAI,CAAC,wDAA6B,CAAC,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAClF,IAAI,CAAC,wDAA6B,CAAC,CAAC,EAAE,CAAC,6BAA6B,CAAC,CAAC,gBAAgB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"main-container-creation-contributions.js","sourceRoot":"","sources":["../../../src/electron-node/devcontainer-contributions/main-container-creation-contributions.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { interfaces } from '@theia/core/shared/inversify';
|
|
2
|
+
import { DockerContainerService } from '../docker-container-service';
|
|
3
|
+
export declare const VariableResolverContribution: unique symbol;
|
|
4
|
+
export interface VariableResolverContribution {
|
|
5
|
+
canResolve(variable: string): boolean;
|
|
6
|
+
resolve(variable: string): string;
|
|
7
|
+
}
|
|
8
|
+
export declare function registerVariableResolverContributions(bind: interfaces.Bind): void;
|
|
9
|
+
export declare class LocalEnvVariableResolver implements VariableResolverContribution {
|
|
10
|
+
canResolve(type: string): boolean;
|
|
11
|
+
resolve(variable: string): string;
|
|
12
|
+
}
|
|
13
|
+
export declare class ContainerIdResolver implements VariableResolverContribution {
|
|
14
|
+
protected readonly dockerContainerService: DockerContainerService;
|
|
15
|
+
canResolve(type: string): boolean;
|
|
16
|
+
resolve(variable: string): string;
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=variable-resolver-contribution.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"variable-resolver-contribution.d.ts","sourceRoot":"","sources":["../../../src/electron-node/devcontainer-contributions/variable-resolver-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAsB,UAAU,EAAyB,MAAM,8BAA8B,CAAC;AACrG,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,eAAO,MAAM,4BAA4B,eAAyC,CAAC;AACnF,MAAM,WAAW,4BAA4B;IACzC,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IACtC,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;CACrC;AAED,wBAAgB,qCAAqC,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAGjF;AAED,qBACa,wBAAyB,YAAW,4BAA4B;IACzE,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAKjC,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;CAGpC;AAED,qBACa,mBAAoB,YAAW,4BAA4B;IAEhE,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAEtE,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAGjC,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;CAGpC"}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// *****************************************************************************
|
|
3
|
+
// Copyright (C) 2025 Typefox and others.
|
|
4
|
+
//
|
|
5
|
+
// This program and the accompanying materials are made available under the
|
|
6
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
7
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
8
|
+
//
|
|
9
|
+
// This Source Code may also be made available under the following Secondary
|
|
10
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
11
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
12
|
+
// with the GNU Classpath Exception which is available at
|
|
13
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
14
|
+
//
|
|
15
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
|
+
// *****************************************************************************
|
|
17
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
exports.ContainerIdResolver = exports.LocalEnvVariableResolver = exports.registerVariableResolverContributions = exports.VariableResolverContribution = void 0;
|
|
19
|
+
const tslib_1 = require("tslib");
|
|
20
|
+
const inversify_1 = require("@theia/core/shared/inversify");
|
|
21
|
+
const docker_container_service_1 = require("../docker-container-service");
|
|
22
|
+
exports.VariableResolverContribution = Symbol('VariableResolverContribution');
|
|
23
|
+
function registerVariableResolverContributions(bind) {
|
|
24
|
+
bind(exports.VariableResolverContribution).to(LocalEnvVariableResolver).inSingletonScope();
|
|
25
|
+
bind(exports.VariableResolverContribution).to(ContainerIdResolver).inSingletonScope();
|
|
26
|
+
}
|
|
27
|
+
exports.registerVariableResolverContributions = registerVariableResolverContributions;
|
|
28
|
+
let LocalEnvVariableResolver = class LocalEnvVariableResolver {
|
|
29
|
+
canResolve(type) {
|
|
30
|
+
console.log(`Resolving localEnv variable: ${type}`);
|
|
31
|
+
return type === 'localEnv';
|
|
32
|
+
}
|
|
33
|
+
resolve(variable) {
|
|
34
|
+
return process.env[variable] || '';
|
|
35
|
+
}
|
|
36
|
+
};
|
|
37
|
+
exports.LocalEnvVariableResolver = LocalEnvVariableResolver;
|
|
38
|
+
exports.LocalEnvVariableResolver = LocalEnvVariableResolver = tslib_1.__decorate([
|
|
39
|
+
(0, inversify_1.injectable)()
|
|
40
|
+
], LocalEnvVariableResolver);
|
|
41
|
+
let ContainerIdResolver = class ContainerIdResolver {
|
|
42
|
+
canResolve(type) {
|
|
43
|
+
return type === 'devcontainerId' && !!this.dockerContainerService.container;
|
|
44
|
+
}
|
|
45
|
+
resolve(variable) {
|
|
46
|
+
var _a;
|
|
47
|
+
return ((_a = this.dockerContainerService.container) === null || _a === void 0 ? void 0 : _a.id) || variable;
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
exports.ContainerIdResolver = ContainerIdResolver;
|
|
51
|
+
tslib_1.__decorate([
|
|
52
|
+
(0, inversify_1.inject)(new inversify_1.LazyServiceIdentifier(() => docker_container_service_1.DockerContainerService)),
|
|
53
|
+
tslib_1.__metadata("design:type", docker_container_service_1.DockerContainerService)
|
|
54
|
+
], ContainerIdResolver.prototype, "dockerContainerService", void 0);
|
|
55
|
+
exports.ContainerIdResolver = ContainerIdResolver = tslib_1.__decorate([
|
|
56
|
+
(0, inversify_1.injectable)()
|
|
57
|
+
], ContainerIdResolver);
|
|
58
|
+
//# sourceMappingURL=variable-resolver-contribution.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"variable-resolver-contribution.js","sourceRoot":"","sources":["../../../src/electron-node/devcontainer-contributions/variable-resolver-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAqG;AACrG,0EAAqE;AAExD,QAAA,4BAA4B,GAAG,MAAM,CAAC,8BAA8B,CAAC,CAAC;AAMnF,SAAgB,qCAAqC,CAAC,IAAqB;IACvE,IAAI,CAAC,oCAA4B,CAAC,CAAC,EAAE,CAAC,wBAAwB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACnF,IAAI,CAAC,oCAA4B,CAAC,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,gBAAgB,EAAE,CAAC;AAClF,CAAC;AAHD,sFAGC;AAGM,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IACjC,UAAU,CAAC,IAAY;QACnB,OAAO,CAAC,GAAG,CAAC,gCAAgC,IAAI,EAAE,CAAC,CAAC;QACpD,OAAO,IAAI,KAAK,UAAU,CAAC;IAC/B,CAAC;IAED,OAAO,CAAC,QAAgB;QACpB,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACvC,CAAC;CACJ,CAAA;AATY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CASpC;AAGM,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAI5B,UAAU,CAAC,IAAY;QACnB,OAAO,IAAI,KAAK,gBAAgB,IAAI,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC;IAChF,CAAC;IACD,OAAO,CAAC,QAAgB;;QACpB,OAAO,CAAA,MAAA,IAAI,CAAC,sBAAsB,CAAC,SAAS,0CAAE,EAAE,KAAI,QAAQ,CAAC;IACjE,CAAC;CACJ,CAAA;AAVY,kDAAmB;AAEL;IADtB,IAAA,kBAAM,EAAC,IAAI,iCAAqB,CAAC,GAAG,EAAE,CAAC,iDAAsB,CAAC,CAAC;sCACjB,iDAAsB;mEAAC;8BAF7D,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;GACA,mBAAmB,CAU/B"}
|
|
@@ -22,6 +22,7 @@ export declare class DockerContainerService {
|
|
|
22
22
|
protected readonly workspaceServer: WorkspaceServer;
|
|
23
23
|
protected readonly containerCreationContributions: ContributionProvider<ContainerCreationContribution>;
|
|
24
24
|
protected readonly devContainerFileService: DevContainerFileService;
|
|
25
|
+
container: Docker.Container | undefined;
|
|
25
26
|
getOrCreateContainer(docker: Docker, options: ContainerConnectionOptions, outputProvider?: ContainerOutputProvider): Promise<Docker.Container>;
|
|
26
27
|
postConnect(devcontainerFile: string, connection: RemoteDockerContainerConnection, outputProvider?: ContainerOutputProvider): Promise<void>;
|
|
27
28
|
protected buildContainer(docker: Docker, devcontainerFile: string, workspace: URI, outputProvider?: ContainerOutputProvider): Promise<Docker.Container>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-container-service.d.ts","sourceRoot":"","sources":["../../src/electron-node/docker-container-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,OAAO,KAAK,MAAM,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,0BAA0B,EAAE,MAAM,yDAAyD,CAAC;AACrG,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAC;AACvF,OAAO,EAAE,+BAA+B,EAAE,MAAM,wCAAwC,CAAC;AAEzF,eAAO,MAAM,6BAA6B,eAA2C,CAAC;AAEtF,MAAM,WAAW,6BAA6B;IAC1C,uBAAuB,CAAC,CAAC,aAAa,EAAE,MAAM,CAAC,sBAAsB,EACjE,eAAe,EAAE,yBAAyB,EAC1C,GAAG,EAAE,MAAM,EACX,cAAc,CAAC,EAAE,uBAAuB,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAElE;;OAEG;IACH,gBAAgB,CAAC,CAAC,eAAe,EAAE,yBAAyB,EACxD,SAAS,EAAE,MAAM,CAAC,SAAS,EAC3B,GAAG,EAAE,MAAM,EACX,cAAc,CAAC,EAAE,uBAAuB,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAElE;;OAEG;IACH,iBAAiB,CAAC,CAAC,eAAe,EAAE,yBAAyB,EAAE,UAAU,EAAE,+BAA+B,EACtG,cAAc,CAAC,EAAE,uBAAuB,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;CACrE;AAED,qBACa,sBAAsB;IAG/B,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,8BAA8B,EAAE,oBAAoB,CAAC,6BAA6B,CAAC,CAAC;IAGvG,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"docker-container-service.d.ts","sourceRoot":"","sources":["../../src/electron-node/docker-container-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,OAAO,KAAK,MAAM,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,0BAA0B,EAAE,MAAM,yDAAyD,CAAC;AACrG,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAC;AACvF,OAAO,EAAE,+BAA+B,EAAE,MAAM,wCAAwC,CAAC;AAEzF,eAAO,MAAM,6BAA6B,eAA2C,CAAC;AAEtF,MAAM,WAAW,6BAA6B;IAC1C,uBAAuB,CAAC,CAAC,aAAa,EAAE,MAAM,CAAC,sBAAsB,EACjE,eAAe,EAAE,yBAAyB,EAC1C,GAAG,EAAE,MAAM,EACX,cAAc,CAAC,EAAE,uBAAuB,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAElE;;OAEG;IACH,gBAAgB,CAAC,CAAC,eAAe,EAAE,yBAAyB,EACxD,SAAS,EAAE,MAAM,CAAC,SAAS,EAC3B,GAAG,EAAE,MAAM,EACX,cAAc,CAAC,EAAE,uBAAuB,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAElE;;OAEG;IACH,iBAAiB,CAAC,CAAC,eAAe,EAAE,yBAAyB,EAAE,UAAU,EAAE,+BAA+B,EACtG,cAAc,CAAC,EAAE,uBAAuB,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;CACrE;AAED,qBACa,sBAAsB;IAG/B,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,8BAA8B,EAAE,oBAAoB,CAAC,6BAA6B,CAAC,CAAC;IAGvG,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAEpE,SAAS,EAAE,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;IAElC,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,0BAA0B,EAAE,cAAc,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;IAyB9I,WAAW,CAAC,gBAAgB,EAAE,MAAM,EAAE,UAAU,EAAE,+BAA+B,EAAE,cAAc,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;cASjI,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,cAAc,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;CAmChK"}
|
|
@@ -27,7 +27,7 @@ let DockerContainerService = class DockerContainerService {
|
|
|
27
27
|
async getOrCreateContainer(docker, options, outputProvider) {
|
|
28
28
|
var _a;
|
|
29
29
|
let container;
|
|
30
|
-
const workspace = new core_1.URI((_a = options.
|
|
30
|
+
const workspace = new core_1.URI((_a = options.workspacePath) !== null && _a !== void 0 ? _a : await this.workspaceServer.getMostRecentlyUsedWorkspace());
|
|
31
31
|
if (options.lastContainerInfo && fs.statSync(options.devcontainerFile).mtimeMs < options.lastContainerInfo.lastUsed) {
|
|
32
32
|
try {
|
|
33
33
|
container = docker.getContainer(options.lastContainerInfo.id);
|
|
@@ -46,6 +46,7 @@ let DockerContainerService = class DockerContainerService {
|
|
|
46
46
|
if (!container) {
|
|
47
47
|
container = await this.buildContainer(docker, options.devcontainerFile, workspace, outputProvider);
|
|
48
48
|
}
|
|
49
|
+
this.container = container;
|
|
49
50
|
return container;
|
|
50
51
|
}
|
|
51
52
|
async postConnect(devcontainerFile, connection, outputProvider) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-container-service.js","sourceRoot":"","sources":["../../src/electron-node/docker-container-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,sCAAsE;AACtE,4DAAyE;AACzE,wDAA8D;AAC9D,kDAAkD;AAIlD,6EAAuE;AAI1D,QAAA,6BAA6B,GAAG,MAAM,CAAC,gCAAgC,CAAC,CAAC;AAwB/E,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;
|
|
1
|
+
{"version":3,"file":"docker-container-service.js","sourceRoot":"","sources":["../../src/electron-node/docker-container-service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/dev-container",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.59.0-next.62+9e43c93ad",
|
|
4
4
|
"description": "Theia - Editor Preview Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.
|
|
7
|
-
"@theia/output": "1.
|
|
8
|
-
"@theia/remote": "1.
|
|
9
|
-
"@theia/workspace": "1.
|
|
6
|
+
"@theia/core": "1.59.0-next.62+9e43c93ad",
|
|
7
|
+
"@theia/output": "1.59.0-next.62+9e43c93ad",
|
|
8
|
+
"@theia/remote": "1.59.0-next.62+9e43c93ad",
|
|
9
|
+
"@theia/workspace": "1.59.0-next.62+9e43c93ad",
|
|
10
10
|
"dockerode": "^4.0.2",
|
|
11
11
|
"jsonc-parser": "^2.2.0",
|
|
12
12
|
"uuid": "^8.0.0"
|
|
@@ -45,11 +45,11 @@
|
|
|
45
45
|
"watch": "theiaext watch"
|
|
46
46
|
},
|
|
47
47
|
"devDependencies": {
|
|
48
|
-
"@theia/ext-scripts": "1.58.
|
|
48
|
+
"@theia/ext-scripts": "1.58.0",
|
|
49
49
|
"@types/dockerode": "^3.3.23"
|
|
50
50
|
},
|
|
51
51
|
"nyc": {
|
|
52
52
|
"extends": "../../configs/nyc.json"
|
|
53
53
|
},
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "9e43c93ad61ea977db3974207bac5d7c1fd3ccd6"
|
|
55
55
|
}
|
|
@@ -82,7 +82,7 @@ export class ContainerConnectionContribution extends AbstractRemoteRegistryContr
|
|
|
82
82
|
throw new Error(`Devcontainer file at ${filePath} not found in workspace`);
|
|
83
83
|
}
|
|
84
84
|
|
|
85
|
-
return this.doOpenInContainer(devcontainerFile, uri.toString());
|
|
85
|
+
return this.doOpenInContainer(devcontainerFile, uri.path.toString());
|
|
86
86
|
}
|
|
87
87
|
|
|
88
88
|
async getWorkspaceLabel(uri: URI): Promise<string | undefined> {
|
|
@@ -103,7 +103,7 @@ export class ContainerConnectionContribution extends AbstractRemoteRegistryContr
|
|
|
103
103
|
this.doOpenInContainer(devcontainerFile);
|
|
104
104
|
}
|
|
105
105
|
|
|
106
|
-
async doOpenInContainer(devcontainerFile: DevContainerFile,
|
|
106
|
+
async doOpenInContainer(devcontainerFile: DevContainerFile, workspacePath?: string): Promise<void> {
|
|
107
107
|
const lastContainerInfoKey = `${LAST_USED_CONTAINER}:${devcontainerFile.path}`;
|
|
108
108
|
const lastContainerInfo = await this.workspaceStorageService.getData<LastContainerInfo | undefined>(lastContainerInfoKey);
|
|
109
109
|
|
|
@@ -113,7 +113,7 @@ export class ContainerConnectionContribution extends AbstractRemoteRegistryContr
|
|
|
113
113
|
nodeDownloadTemplate: this.remotePreferences['remote.nodeDownloadTemplate'],
|
|
114
114
|
lastContainerInfo,
|
|
115
115
|
devcontainerFile: devcontainerFile.path,
|
|
116
|
-
|
|
116
|
+
workspacePath: workspacePath
|
|
117
117
|
});
|
|
118
118
|
|
|
119
119
|
this.workspaceStorageService.setData<LastContainerInfo>(lastContainerInfoKey, {
|
|
@@ -122,7 +122,7 @@ export class ContainerConnectionContribution extends AbstractRemoteRegistryContr
|
|
|
122
122
|
});
|
|
123
123
|
|
|
124
124
|
this.workspaceServer.setMostRecentlyUsedWorkspace(
|
|
125
|
-
`${DEV_CONTAINER_WORKSPACE_SCHEME}:${this.workspaceService.workspace?.resource.path}?${DEV_CONTAINER_PATH_QUERY}=${devcontainerFile.path}`);
|
|
125
|
+
`${DEV_CONTAINER_WORKSPACE_SCHEME}:${workspacePath ?? this.workspaceService.workspace?.resource.path}?${DEV_CONTAINER_PATH_QUERY}=${devcontainerFile.path}`);
|
|
126
126
|
|
|
127
127
|
this.openRemote(connectionResult.port, false, connectionResult.workspacePath);
|
|
128
128
|
}
|
|
@@ -28,11 +28,14 @@ import { RemoteCliContribution } from '@theia/core/lib/node/remote/remote-cli-co
|
|
|
28
28
|
import { ProfileFileModificationContribution } from './devcontainer-contributions/profile-file-modification-contribution';
|
|
29
29
|
import { DevContainerWorkspaceHandler } from './dev-container-workspace-handler';
|
|
30
30
|
import { WorkspaceHandlerContribution } from '@theia/workspace/lib/node/default-workspace-server';
|
|
31
|
+
import { registerVariableResolverContributions, VariableResolverContribution } from './devcontainer-contributions/variable-resolver-contribution';
|
|
31
32
|
|
|
32
33
|
export const remoteConnectionModule = ConnectionContainerModule.create(({ bind, bindBackendService }) => {
|
|
33
34
|
bindContributionProvider(bind, ContainerCreationContribution);
|
|
34
35
|
registerContainerCreationContributions(bind);
|
|
35
36
|
registerTheiaStartOptionsContributions(bind);
|
|
37
|
+
bindContributionProvider(bind, VariableResolverContribution);
|
|
38
|
+
registerVariableResolverContributions(bind);
|
|
36
39
|
bind(ProfileFileModificationContribution).toSelf().inSingletonScope();
|
|
37
40
|
bind(ContainerCreationContribution).toService(ProfileFileModificationContribution);
|
|
38
41
|
|
|
@@ -14,13 +14,16 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
17
|
+
import { inject, injectable, named } from '@theia/core/shared/inversify';
|
|
18
18
|
import { WorkspaceServer } from '@theia/workspace/lib/common';
|
|
19
19
|
import { DevContainerFile } from '../electron-common/remote-container-connection-provider';
|
|
20
20
|
import { DevContainerConfiguration } from './devcontainer-file';
|
|
21
21
|
import { parse } from 'jsonc-parser';
|
|
22
22
|
import * as fs from '@theia/core/shared/fs-extra';
|
|
23
|
-
import { Path, URI } from '@theia/core';
|
|
23
|
+
import { ContributionProvider, Path, URI } from '@theia/core';
|
|
24
|
+
import { VariableResolverContribution } from './devcontainer-contributions/variable-resolver-contribution';
|
|
25
|
+
|
|
26
|
+
const VARIABLE_REGEX = /^\$\{(.+?)(?::(.+))?\}$/;
|
|
24
27
|
|
|
25
28
|
@injectable()
|
|
26
29
|
export class DevContainerFileService {
|
|
@@ -28,12 +31,44 @@ export class DevContainerFileService {
|
|
|
28
31
|
@inject(WorkspaceServer)
|
|
29
32
|
protected readonly workspaceServer: WorkspaceServer;
|
|
30
33
|
|
|
34
|
+
@inject(ContributionProvider) @named(VariableResolverContribution)
|
|
35
|
+
protected readonly variableResolverContributions: ContributionProvider<VariableResolverContribution>;
|
|
36
|
+
|
|
37
|
+
protected resolveVariable(value: string): string {
|
|
38
|
+
const match = value.match(VARIABLE_REGEX);
|
|
39
|
+
if (match) {
|
|
40
|
+
const [, type, variable] = match;
|
|
41
|
+
for (const contribution of this.variableResolverContributions.getContributions()) {
|
|
42
|
+
if (contribution.canResolve(type)) {
|
|
43
|
+
return contribution.resolve(variable ?? type);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
return value;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
protected resolveVariablesRecursively<T>(obj: T): T {
|
|
51
|
+
if (typeof obj === 'string') {
|
|
52
|
+
return this.resolveVariable(obj) as T;
|
|
53
|
+
} else if (Array.isArray(obj)) {
|
|
54
|
+
return obj.map(item => this.resolveVariablesRecursively(item)) as T;
|
|
55
|
+
} else if (obj && typeof obj === 'object') {
|
|
56
|
+
const newObj: Record<string, unknown> = {};
|
|
57
|
+
for (const [key, value] of Object.entries(obj)) {
|
|
58
|
+
newObj[key] = this.resolveVariablesRecursively(value);
|
|
59
|
+
}
|
|
60
|
+
return newObj as T;
|
|
61
|
+
}
|
|
62
|
+
return obj;
|
|
63
|
+
}
|
|
64
|
+
|
|
31
65
|
async getConfiguration(path: string): Promise<DevContainerConfiguration> {
|
|
32
|
-
|
|
66
|
+
let configuration: DevContainerConfiguration = parse(await fs.readFile(path, 'utf-8').catch(() => '0')) as DevContainerConfiguration;
|
|
33
67
|
if (!configuration) {
|
|
34
68
|
throw new Error(`devcontainer file ${path} could not be parsed`);
|
|
35
69
|
}
|
|
36
70
|
|
|
71
|
+
configuration = this.resolveVariablesRecursively(configuration);
|
|
37
72
|
configuration.location = path;
|
|
38
73
|
return configuration;
|
|
39
74
|
}
|
package/src/electron-node/devcontainer-contributions/main-container-creation-contributions.ts
CHANGED
|
@@ -30,6 +30,7 @@ export function registerContainerCreationContributions(bind: interfaces.Bind): v
|
|
|
30
30
|
bind(ContainerCreationContribution).to(MountsContribution).inSingletonScope();
|
|
31
31
|
bind(ContainerCreationContribution).to(RemoteUserContribution).inSingletonScope();
|
|
32
32
|
bind(ContainerCreationContribution).to(PostCreateCommandContribution).inSingletonScope();
|
|
33
|
+
bind(ContainerCreationContribution).to(ContainerEnvContribution).inSingletonScope();
|
|
33
34
|
}
|
|
34
35
|
|
|
35
36
|
@injectable()
|
|
@@ -182,6 +183,20 @@ export class PostCreateCommandContribution implements ContainerCreationContribut
|
|
|
182
183
|
}
|
|
183
184
|
}
|
|
184
185
|
|
|
186
|
+
@injectable()
|
|
187
|
+
export class ContainerEnvContribution implements ContainerCreationContribution {
|
|
188
|
+
async handleContainerCreation(createOptions: Docker.ContainerCreateOptions, containerConfig: DevContainerConfiguration): Promise<void> {
|
|
189
|
+
if (containerConfig.containerEnv) {
|
|
190
|
+
if (createOptions.Env === undefined) {
|
|
191
|
+
createOptions.Env = [];
|
|
192
|
+
}
|
|
193
|
+
for (const [key, value] of Object.entries(containerConfig.containerEnv)) {
|
|
194
|
+
createOptions.Env.push(`${key}=${value}`);
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
|
|
185
200
|
export namespace OutputHelper {
|
|
186
201
|
export interface Progress {
|
|
187
202
|
id?: string;
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
// *****************************************************************************
|
|
2
|
+
// Copyright (C) 2025 Typefox and others.
|
|
3
|
+
//
|
|
4
|
+
// This program and the accompanying materials are made available under the
|
|
5
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
+
//
|
|
8
|
+
// This Source Code may also be made available under the following Secondary
|
|
9
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
+
// with the GNU Classpath Exception which is available at
|
|
12
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
13
|
+
//
|
|
14
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
|
+
// *****************************************************************************
|
|
16
|
+
|
|
17
|
+
import { inject, injectable, interfaces, LazyServiceIdentifier } from '@theia/core/shared/inversify';
|
|
18
|
+
import { DockerContainerService } from '../docker-container-service';
|
|
19
|
+
|
|
20
|
+
export const VariableResolverContribution = Symbol('VariableResolverContribution');
|
|
21
|
+
export interface VariableResolverContribution {
|
|
22
|
+
canResolve(variable: string): boolean;
|
|
23
|
+
resolve(variable: string): string;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
export function registerVariableResolverContributions(bind: interfaces.Bind): void {
|
|
27
|
+
bind(VariableResolverContribution).to(LocalEnvVariableResolver).inSingletonScope();
|
|
28
|
+
bind(VariableResolverContribution).to(ContainerIdResolver).inSingletonScope();
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
@injectable()
|
|
32
|
+
export class LocalEnvVariableResolver implements VariableResolverContribution {
|
|
33
|
+
canResolve(type: string): boolean {
|
|
34
|
+
console.log(`Resolving localEnv variable: ${type}`);
|
|
35
|
+
return type === 'localEnv';
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
resolve(variable: string): string {
|
|
39
|
+
return process.env[variable] || '';
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
@injectable()
|
|
44
|
+
export class ContainerIdResolver implements VariableResolverContribution {
|
|
45
|
+
@inject(new LazyServiceIdentifier(() => DockerContainerService))
|
|
46
|
+
protected readonly dockerContainerService: DockerContainerService;
|
|
47
|
+
|
|
48
|
+
canResolve(type: string): boolean {
|
|
49
|
+
return type === 'devcontainerId' && !!this.dockerContainerService.container;
|
|
50
|
+
}
|
|
51
|
+
resolve(variable: string): string {
|
|
52
|
+
return this.dockerContainerService.container?.id || variable;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
@@ -60,10 +60,12 @@ export class DockerContainerService {
|
|
|
60
60
|
@inject(DevContainerFileService)
|
|
61
61
|
protected readonly devContainerFileService: DevContainerFileService;
|
|
62
62
|
|
|
63
|
+
container: Docker.Container | undefined;
|
|
64
|
+
|
|
63
65
|
async getOrCreateContainer(docker: Docker, options: ContainerConnectionOptions, outputProvider?: ContainerOutputProvider): Promise<Docker.Container> {
|
|
64
66
|
let container;
|
|
65
67
|
|
|
66
|
-
const workspace = new URI(options.
|
|
68
|
+
const workspace = new URI(options.workspacePath ?? await this.workspaceServer.getMostRecentlyUsedWorkspace());
|
|
67
69
|
|
|
68
70
|
if (options.lastContainerInfo && fs.statSync(options.devcontainerFile).mtimeMs < options.lastContainerInfo.lastUsed) {
|
|
69
71
|
try {
|
|
@@ -81,6 +83,7 @@ export class DockerContainerService {
|
|
|
81
83
|
if (!container) {
|
|
82
84
|
container = await this.buildContainer(docker, options.devcontainerFile, workspace, outputProvider);
|
|
83
85
|
}
|
|
86
|
+
this.container = container;
|
|
84
87
|
return container;
|
|
85
88
|
}
|
|
86
89
|
|