@theia/dev-container 1.67.0-next.3 → 1.67.0-next.59

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.
Files changed (27) hide show
  1. package/README.md +10 -1
  2. package/lib/electron-browser/container-info-contribution.js +2 -2
  3. package/lib/electron-browser/container-info-contribution.js.map +1 -1
  4. package/lib/electron-node/dev-container-backend-module.d.ts.map +1 -1
  5. package/lib/electron-node/dev-container-backend-module.js +2 -0
  6. package/lib/electron-node/dev-container-backend-module.js.map +1 -1
  7. package/lib/electron-node/devcontainer-file.d.ts +4 -0
  8. package/lib/electron-node/devcontainer-file.d.ts.map +1 -1
  9. package/lib/electron-node/docker-compose/compose-service.d.ts +9 -0
  10. package/lib/electron-node/docker-compose/compose-service.d.ts.map +1 -0
  11. package/lib/electron-node/docker-compose/compose-service.js +73 -0
  12. package/lib/electron-node/docker-compose/compose-service.js.map +1 -0
  13. package/lib/electron-node/docker-container-service.d.ts +2 -0
  14. package/lib/electron-node/docker-container-service.d.ts.map +1 -1
  15. package/lib/electron-node/docker-container-service.js +18 -3
  16. package/lib/electron-node/docker-container-service.js.map +1 -1
  17. package/lib/electron-node/remote-container-connection-provider.d.ts +6 -1
  18. package/lib/electron-node/remote-container-connection-provider.d.ts.map +1 -1
  19. package/lib/electron-node/remote-container-connection-provider.js +37 -6
  20. package/lib/electron-node/remote-container-connection-provider.js.map +1 -1
  21. package/package.json +6 -6
  22. package/src/electron-browser/container-info-contribution.ts +2 -2
  23. package/src/electron-node/dev-container-backend-module.ts +3 -0
  24. package/src/electron-node/devcontainer-file.ts +4 -0
  25. package/src/electron-node/docker-compose/compose-service.ts +79 -0
  26. package/src/electron-node/docker-container-service.ts +18 -3
  27. package/src/electron-node/remote-container-connection-provider.ts +41 -7
package/README.md CHANGED
@@ -16,7 +16,7 @@ The `@theia/dev-container` extension provides functionality to create, start and
16
16
  [vscode Dev Containers extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers).
17
17
 
18
18
  The full devcontainer.json Schema can be found [here](https://containers.dev/implementors/json_reference/).
19
- Currently only a small number of configuration file properties are implemented. Those include the following:
19
+ Currently not all of the configuration file properties are implemented. The following are implemented:
20
20
 
21
21
  - name
22
22
  - Image
@@ -25,11 +25,20 @@ Currently only a small number of configuration file properties are implemented.
25
25
  - location
26
26
  - forwardPorts
27
27
  - mounts
28
+ - containerEnv
29
+ - remoteUser
30
+ - shutdownAction
31
+ - postCreateCommand
32
+ - postStartCommand
28
33
 
29
34
  see `main-container-creation-contributions.ts` for how to implementations or how to implement additional ones.
30
35
 
36
+ Additionally adds support for `composeUpArgs` devcontainer.json property to apply additional arguments for the `docker compose up` call.
37
+ Usage: `"composeUpArgs": ["--force-recreate"]`
38
+
31
39
  ## Additional Information
32
40
 
41
+ - [API documentation for `@theia/dev-container`](https://eclipse-theia.github.io/theia/docs/next/modules/_theia_dev-container.html)
33
42
  - [Theia - GitHub](https://github.com/eclipse-theia/theia)
34
43
  - [Theia - Website](https://theia-ide.org/)
35
44
 
package/lib/electron-browser/container-info-contribution.js CHANGED
@@ -29,7 +29,7 @@ let ContainerInfoContribution = class ContainerInfoContribution {
29
29
  const containerPort = parseInt((_a = new URLSearchParams(location.search).get('port')) !== null && _a !== void 0 ? _a : '0');
30
30
  const containerInfo = await this.connectionProvider.getCurrentContainerInfo(containerPort);
31
31
  this.status = await this.remoteStatusService.getStatus(containerPort);
32
- this.portForwardingService.forwardedPorts = Object.entries((_b = containerInfo === null || containerInfo === void 0 ? void 0 : containerInfo.NetworkSettings.Ports) !== null && _b !== void 0 ? _b : {}).flatMap(([_, ports]) => (ports.map(port => {
32
+ this.portForwardingService.forwardedPorts.push(...Object.entries((_b = containerInfo === null || containerInfo === void 0 ? void 0 : containerInfo.NetworkSettings.Ports) !== null && _b !== void 0 ? _b : {}).flatMap(([_, ports]) => (ports.map(port => {
33
33
  var _a, _b;
34
34
  return ({
35
35
  editing: false,
@@ -37,7 +37,7 @@ let ContainerInfoContribution = class ContainerInfoContribution {
37
37
  localPort: parseInt((_b = port.HostPort) !== null && _b !== void 0 ? _b : '0'),
38
38
  origin: 'container'
39
39
  });
40
- })));
40
+ }))));
41
41
  }
42
42
  enhanceTitle(title, parts) {
43
43
  if (this.status && this.status.alive) {
package/lib/electron-browser/container-info-contribution.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"container-info-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/container-info-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;AAElE,mGAA4G;AAG5G,kHAA4G;AAC5G,wHAAmH;AACnH,0FAAuF;AACvF,sCAAkC;AAG3B,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAclC,KAAK,CAAC,OAAO;;QACT,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAA,IAAI,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,mCAAI,GAAG,CAAC,CAAC;QACxF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC;QAC3F,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QAEtE,IAAI,CAAC,qBAAqB,CAAC,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,eAAe,CAAC,KAAK,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAC3H,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;;YAAC,OAAA,CAAC;gBACf,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,MAAA,IAAI,CAAC,MAAM,mCAAI,EAAE;gBAC1B,SAAS,EAAE,QAAQ,CAAC,MAAA,IAAI,CAAC,QAAQ,mCAAI,GAAG,CAAC;gBACzC,MAAM,EAAE,WAAW;aACtB,CAAC,CAAA;SAAA,CAAC,CAAC,CAAC,CAAC;IACd,CAAC;IAED,YAAY,CAAC,KAAa,EAAE,KAAsC;QAC9D,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACnC,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;YAC1C,KAAK,GAAG,GAAG,KAAK,kBAAkB,gBAAgB,CAAC,CAAC,CAAC,IAAI,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;QACzF,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,SAAS,CAAC,OAAe;QACrB,IAAI,OAAO,IAAI,OAAO,EAAE,CAAC;YACrB,IAAI,iBAAiB,GAAG,IAAI,eAAe,CAAE,OAAe,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,mDAAwB,CAAC,CAAC;YAClG,IAAI,iBAAiB,EAAE,CAAC;gBACpB,IAAI,iBAAiB,CAAC,UAAU,CAAE,OAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;oBACjE,iBAAiB,GAAG,iBAAiB,CAAC,OAAO,CAAE,OAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;gBACxF,CAAC;gBACD,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;gBAC3C,OAAO,GAAG,CAAC;YACf,CAAC;YAAA,CAAC;YACF,OAAO,CAAC,CAAC;QACb,CAAC;QACD,OAAO,CAAC,CAAC;IACb,CAAC;IAED,OAAO,CAAC,OAAY;QAChB,MAAM,GAAG,GAAG,IAAI,UAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;QAC1D,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,kBAAkB,GAAG,IAAI,GAAG,KAAK,eAAe,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;IACrG,CAAC;CAEJ,CAAA;AAxDY,8DAAyB;AAEf;IADlB,IAAA,kBAAM,EAAC,wEAAiC,CAAC;;qEAC+B;AAGtD;IADlB,IAAA,kBAAM,EAAC,+CAAqB,CAAC;sCACY,+CAAqB;wEAAC;AAG7C;IADlB,IAAA,kBAAM,EAAC,2CAAmB,CAAC;;sEACgC;oCARnD,yBAAyB;IADrC,IAAA,sBAAU,GAAE;GACA,yBAAyB,CAwDrC"}
1
+ {"version":3,"file":"container-info-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/container-info-contribution.ts"],"names":[],"mappings":"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"}
package/lib/electron-node/dev-container-backend-module.d.ts.map CHANGED
@@ -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;AAgB/D,eAAO,MAAM,sBAAsB,iBAkBjC,CAAC;;AAEH,wBAaG"}
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;AAiB/D,eAAO,MAAM,sBAAsB,iBAkBjC,CAAC;;AAEH,wBAeG"}
package/lib/electron-node/dev-container-backend-module.js CHANGED
@@ -30,6 +30,7 @@ const profile_file_modification_contribution_1 = require("./devcontainer-contrib
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
32
  const variable_resolver_contribution_1 = require("./devcontainer-contributions/variable-resolver-contribution");
33
+ const compose_service_1 = require("./docker-compose/compose-service");
33
34
  exports.remoteConnectionModule = connection_container_module_1.ConnectionContainerModule.create(({ bind, bindBackendService }) => {
34
35
  (0, core_1.bindContributionProvider)(bind, docker_container_service_1.ContainerCreationContribution);
35
36
  (0, main_container_creation_contributions_1.registerContainerCreationContributions)(bind);
@@ -50,6 +51,7 @@ exports.remoteConnectionModule = connection_container_module_1.ConnectionContain
50
51
  exports.default = new inversify_1.ContainerModule((bind, unbind, isBound, rebind) => {
51
52
  bind(docker_container_service_1.DockerContainerService).toSelf().inSingletonScope();
52
53
  bind(connection_container_module_1.ConnectionContainerModule).toConstantValue(exports.remoteConnectionModule);
54
+ bind(compose_service_1.DockerComposeService).toSelf().inSingletonScope();
53
55
  bind(dev_container_file_service_1.DevContainerFileService).toSelf().inSingletonScope();
54
56
  bind(cli_enhancing_creation_contributions_1.ExtensionsContribution).toSelf().inSingletonScope();
55
57
  bind(cli_enhancing_creation_contributions_1.SettingsContribution).toSelf().inSingletonScope();
package/lib/electron-node/dev-container-backend-module.js.map CHANGED
@@ -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;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
+ {"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;AAClJ,sEAAwE;AAE3D,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,sCAAoB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAEvD,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"}
package/lib/electron-node/devcontainer-file.d.ts CHANGED
@@ -142,6 +142,10 @@ export interface ComposeContainer {
142
142
  * Whether to overwrite the command specified in the image. The default is false.
143
143
  */
144
144
  overrideCommand?: boolean;
145
+ /**
146
+ * Allows passing additional arguments to the 'docker compose up' command.
147
+ */
148
+ composeUpArgs?: string[];
145
149
  [k: string]: unknown;
146
150
  }
147
151
  export interface DevContainerCommon {
package/lib/electron-node/devcontainer-file.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"devcontainer-file.d.ts","sourceRoot":"","sources":["../../src/electron-node/devcontainer-file.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"devcontainer-file.d.ts","sourceRoot":"","sources":["../../src/electron-node/devcontainer-file.ts"],"names":[],"mappings":"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"}
package/lib/electron-node/docker-compose/compose-service.d.ts ADDED
@@ -0,0 +1,9 @@
1
+ import * as Docker from 'dockerode';
2
+ import { DevContainerConfiguration } from '../devcontainer-file';
3
+ import { ContainerOutputProvider } from '../../electron-common/container-output-provider';
4
+ export declare class DockerComposeService {
5
+ createContainers(devcontainerConfig: DevContainerConfiguration, containerCreateOptions: Docker.ContainerCreateOptions, outputProvider?: ContainerOutputProvider): Promise<string>;
6
+ protected executeComposeCommand(composeFilePath: string, command: string, args: string[], outputProvider?: ContainerOutputProvider): Promise<string>;
7
+ }
8
+ export declare function resolveComposeFilePath(devcontainerConfig: DevContainerConfiguration): string;
9
+ //# sourceMappingURL=compose-service.d.ts.map
package/lib/electron-node/docker-compose/compose-service.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"compose-service.d.ts","sourceRoot":"","sources":["../../../src/electron-node/docker-compose/compose-service.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,MAAM,MAAM,WAAW,CAAC;AACpC,OAAO,EAAoB,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACnF,OAAO,EAAE,uBAAuB,EAAE,MAAM,iDAAiD,CAAC;AAI1F,qBACa,oBAAoB;IAEvB,gBAAgB,CAClB,kBAAkB,EAAE,yBAAyB,EAC7C,sBAAsB,EAAE,MAAM,CAAC,sBAAsB,EACrD,cAAc,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC;IAc9D,SAAS,CAAC,qBAAqB,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,cAAc,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC;CAmBvJ;AAED,wBAAgB,sBAAsB,CAAC,kBAAkB,EAAE,yBAAyB,GAAG,MAAM,CAc5F"}
package/lib/electron-node/docker-compose/compose-service.js ADDED
@@ -0,0 +1,73 @@
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.resolveComposeFilePath = exports.DockerComposeService = void 0;
19
+ const tslib_1 = require("tslib");
20
+ const inversify_1 = require("@theia/core/shared/inversify");
21
+ const child_process_1 = require("child_process");
22
+ const path = require("path");
23
+ let DockerComposeService = class DockerComposeService {
24
+ async createContainers(devcontainerConfig, containerCreateOptions, outputProvider) {
25
+ if (!devcontainerConfig.dockerComposeFile || typeof devcontainerConfig.dockerComposeFile !== 'string') {
26
+ throw new Error('dockerComposeFile is not defined in devcontainer configuration. Multiple files are not supported currently');
27
+ }
28
+ const dockerComposeFilePath = resolveComposeFilePath(devcontainerConfig);
29
+ const composeUpArgs = Array.isArray(devcontainerConfig.composeUpArgs) ? devcontainerConfig.composeUpArgs : [];
30
+ await this.executeComposeCommand(dockerComposeFilePath, 'up', ['--detach', ...composeUpArgs], outputProvider);
31
+ return devcontainerConfig.service;
32
+ }
33
+ executeComposeCommand(composeFilePath, command, args, outputProvider) {
34
+ return new Promise((resolve, reject) => {
35
+ const process = (0, child_process_1.spawn)('docker', ['compose', '-f', composeFilePath, command, ...args]);
36
+ process.stdout.on('data', data => {
37
+ outputProvider === null || outputProvider === void 0 ? void 0 : outputProvider.onRemoteOutput(data.toString());
38
+ });
39
+ process.stderr.on('data', data => {
40
+ outputProvider === null || outputProvider === void 0 ? void 0 : outputProvider.onRemoteOutput(data.toString());
41
+ });
42
+ process.on('close', code => {
43
+ outputProvider === null || outputProvider === void 0 ? void 0 : outputProvider.onRemoteOutput(`docker compose process exited with code ${code}`);
44
+ if (code === 0) {
45
+ resolve(''); // TODO return real container ids
46
+ }
47
+ else {
48
+ reject(new Error(`docker compose process exited with code ${code}`));
49
+ }
50
+ });
51
+ });
52
+ }
53
+ };
54
+ exports.DockerComposeService = DockerComposeService;
55
+ exports.DockerComposeService = DockerComposeService = tslib_1.__decorate([
56
+ (0, inversify_1.injectable)()
57
+ ], DockerComposeService);
58
+ function resolveComposeFilePath(devcontainerConfig) {
59
+ if (!devcontainerConfig.dockerComposeFile) {
60
+ throw new Error('dockerComposeFile is not defined in devcontainer configuration.');
61
+ }
62
+ if (typeof devcontainerConfig.dockerComposeFile !== 'string') {
63
+ throw new Error('Multiple docker compose files are not supported currently.');
64
+ }
65
+ if (path.isAbsolute(devcontainerConfig.dockerComposeFile)) {
66
+ return devcontainerConfig.dockerComposeFile;
67
+ }
68
+ else {
69
+ return path.resolve(path.dirname(devcontainerConfig.location), devcontainerConfig.dockerComposeFile);
70
+ }
71
+ }
72
+ exports.resolveComposeFilePath = resolveComposeFilePath;
73
+ //# sourceMappingURL=compose-service.js.map
package/lib/electron-node/docker-compose/compose-service.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"compose-service.js","sourceRoot":"","sources":["../../../src/electron-node/docker-compose/compose-service.ts"],"names":[],"mappings":"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"}
package/lib/electron-node/docker-container-service.d.ts CHANGED
@@ -6,6 +6,7 @@ import { DevContainerConfiguration } from './devcontainer-file';
6
6
  import { DevContainerFileService } from './dev-container-file-service';
7
7
  import { ContainerOutputProvider } from '../electron-common/container-output-provider';
8
8
  import { RemoteDockerContainerConnection } from './remote-container-connection-provider';
9
+ import { DockerComposeService } from './docker-compose/compose-service';
9
10
  export declare const ContainerCreationContribution: unique symbol;
10
11
  export interface ContainerCreationContribution {
11
12
  handleContainerCreation?(createOptions: Docker.ContainerCreateOptions, containerConfig: DevContainerConfiguration, api: Docker, outputProvider?: ContainerOutputProvider): MaybePromise<void>;
@@ -22,6 +23,7 @@ export declare class DockerContainerService {
22
23
  protected readonly workspaceServer: WorkspaceServer;
23
24
  protected readonly containerCreationContributions: ContributionProvider<ContainerCreationContribution>;
24
25
  protected readonly devContainerFileService: DevContainerFileService;
26
+ protected readonly dockerComposeService: DockerComposeService;
25
27
  container: Docker.Container | undefined;
26
28
  getOrCreateContainer(docker: Docker, options: ContainerConnectionOptions, outputProvider?: ContainerOutputProvider): Promise<Docker.Container>;
27
29
  postConnect(devcontainerFile: string, connection: RemoteDockerContainerConnection, outputProvider?: ContainerOutputProvider): Promise<void>;
package/lib/electron-node/docker-container-service.d.ts.map CHANGED
@@ -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;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"}
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;AACzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAExE,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;IAGpE,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAE9D,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;CA8ChK"}
package/lib/electron-node/docker-container-service.js CHANGED
@@ -22,6 +22,7 @@ const inversify_1 = require("@theia/core/shared/inversify");
22
22
  const common_1 = require("@theia/workspace/lib/common");
23
23
  const fs = require("@theia/core/shared/fs-extra");
24
24
  const dev_container_file_service_1 = require("./dev-container-file-service");
25
+ const compose_service_1 = require("./docker-compose/compose-service");
25
26
  exports.ContainerCreationContribution = Symbol('ContainerCreationContributions');
26
27
  let DockerContainerService = class DockerContainerService {
27
28
  async getOrCreateContainer(docker, options, outputProvider) {
@@ -78,9 +79,19 @@ let DockerContainerService = class DockerContainerService {
78
79
  for (const containerCreateContrib of this.containerCreationContributions.getContributions()) {
79
80
  await ((_a = containerCreateContrib.handleContainerCreation) === null || _a === void 0 ? void 0 : _a.call(containerCreateContrib, containerCreateOptions, devcontainerConfig, docker, outputProvider));
80
81
  }
81
- // TODO add more config
82
- const container = await docker.createContainer(containerCreateOptions);
83
- await container.start();
82
+ let container;
83
+ if (devcontainerConfig.dockerComposeFile) {
84
+ const containerName = await this.dockerComposeService.createContainers(devcontainerConfig, containerCreateOptions, outputProvider);
85
+ const services = await docker.listContainers({ filters: { label: [`com.docker.compose.service=${containerName}`] } });
86
+ if (services.length === 0) {
87
+ throw new Error(`No running container found for docker compose service ${containerName}`);
88
+ }
89
+ container = docker.getContainer(services[0].Id);
90
+ }
91
+ else {
92
+ container = await docker.createContainer(containerCreateOptions);
93
+ await container.start();
94
+ }
84
95
  for (const containerCreateContrib of this.containerCreationContributions.getContributions()) {
85
96
  await ((_b = containerCreateContrib.handlePostCreate) === null || _b === void 0 ? void 0 : _b.call(containerCreateContrib, devcontainerConfig, container, docker, outputProvider));
86
97
  }
@@ -101,6 +112,10 @@ tslib_1.__decorate([
101
112
  (0, inversify_1.inject)(dev_container_file_service_1.DevContainerFileService),
102
113
  tslib_1.__metadata("design:type", dev_container_file_service_1.DevContainerFileService)
103
114
  ], DockerContainerService.prototype, "devContainerFileService", void 0);
115
+ tslib_1.__decorate([
116
+ (0, inversify_1.inject)(compose_service_1.DockerComposeService),
117
+ tslib_1.__metadata("design:type", compose_service_1.DockerComposeService)
118
+ ], DockerContainerService.prototype, "dockerComposeService", void 0);
104
119
  exports.DockerContainerService = DockerContainerService = tslib_1.__decorate([
105
120
  (0, inversify_1.injectable)()
106
121
  ], DockerContainerService);
package/lib/electron-node/docker-container-service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"docker-container-service.js","sourceRoot":"","sources":["../../src/electron-node/docker-container-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"docker-container-service.js","sourceRoot":"","sources":["../../src/electron-node/docker-container-service.ts"],"names":[],"mappings":"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"}
package/lib/electron-node/remote-container-connection-provider.d.ts CHANGED
@@ -15,6 +15,7 @@ import { DockerContainerService } from './docker-container-service';
15
15
  import { WriteStream } from 'tty';
16
16
  import { DevContainerFileService } from './dev-container-file-service';
17
17
  import { ContainerOutputProvider } from '../electron-common/container-output-provider';
18
+ import { DevContainerConfiguration } from './devcontainer-file';
18
19
  export declare class DevContainerConnectionProvider implements RemoteContainerConnectionProvider, RpcServer<ContainerOutputProvider> {
19
20
  protected readonly remoteConnectionService: RemoteConnectionService;
20
21
  protected readonly remoteSetup: RemoteSetupService;
@@ -28,7 +29,7 @@ export declare class DevContainerConnectionProvider implements RemoteContainerCo
28
29
  setClient(client: ContainerOutputProvider): void;
29
30
  connectToContainer(options: ContainerConnectionOptions): Promise<ContainerConnectionResult>;
30
31
  getDevContainerFiles(workspacePath: string): Promise<DevContainerFile[]>;
31
- createContainerConnection(container: Docker.Container, docker: Docker, name?: string): Promise<RemoteDockerContainerConnection>;
32
+ createContainerConnection(container: Docker.Container, docker: Docker, config: DevContainerConfiguration): Promise<RemoteDockerContainerConnection>;
32
33
  getCurrentContainerInfo(port: number): Promise<Docker.ContainerInspectInfo | undefined>;
33
34
  dispose(): void;
34
35
  }
@@ -38,6 +39,7 @@ export interface RemoteContainerConnectionOptions {
38
39
  type: string;
39
40
  docker: Docker;
40
41
  container: Docker.Container;
42
+ config: DevContainerConfiguration;
41
43
  }
42
44
  interface ContainerTerminalSession {
43
45
  execution: Docker.Exec;
@@ -58,6 +60,7 @@ interface ContainerTerminalSession {
58
60
  }>;
59
61
  }
60
62
  export declare class RemoteDockerContainerConnection implements RemoteConnection {
63
+ protected readonly logger: ILogger;
61
64
  id: string;
62
65
  name: string;
63
66
  type: string;
@@ -66,6 +69,7 @@ export declare class RemoteDockerContainerConnection implements RemoteConnection
66
69
  docker: Docker;
67
70
  container: Docker.Container;
68
71
  remoteSetupResult: RemoteSetupResult;
72
+ protected config: DevContainerConfiguration;
69
73
  protected activeTerminalSession: ContainerTerminalSession | undefined;
70
74
  protected readonly onDidDisconnectEmitter: Emitter<void>;
71
75
  onDidDisconnect: Event<void>;
@@ -77,6 +81,7 @@ export declare class RemoteDockerContainerConnection implements RemoteConnection
77
81
  copy(localPath: string | Buffer | NodeJS.ReadableStream, remotePath: string): Promise<void>;
78
82
  disposeSync(): void;
79
83
  dispose(): Promise<void>;
84
+ protected shutdownContainer(sync: boolean): Promise<unknown>;
80
85
  }
81
86
  export {};
82
87
  //# sourceMappingURL=remote-container-connection-provider.d.ts.map
package/lib/electron-node/remote-container-connection-provider.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"remote-container-connection-provider.d.ts","sourceRoot":"","sources":["../../src/electron-node/remote-container-connection-provider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"remote-container-connection-provider.d.ts","sourceRoot":"","sources":["../../src/electron-node/remote-container-connection-provider.ts"],"names":[],"mappings":"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"}
package/lib/electron-node/remote-container-connection-provider.js CHANGED
@@ -28,6 +28,7 @@ const promise_util_1 = require("@theia/core/lib/common/promise-util");
28
28
  const stream_1 = require("stream");
29
29
  const child_process_1 = require("child_process");
30
30
  const dev_container_file_service_1 = require("./dev-container-file-service");
31
+ const compose_service_1 = require("./docker-compose/compose-service");
31
32
  let DevContainerConnectionProvider = class DevContainerConnectionProvider {
32
33
  setClient(client) {
33
34
  this.outputProvider = client;
@@ -83,7 +84,7 @@ let DevContainerConnectionProvider = class DevContainerConnectionProvider {
83
84
  // create actual connection
84
85
  const report = message => progress.report({ message });
85
86
  report('Connecting to remote system...');
86
- const remote = await this.createContainerConnection(container, dockerConnection, devContainerConfig.name);
87
+ const remote = await this.createContainerConnection(container, dockerConnection, devContainerConfig);
87
88
  const result = await this.remoteSetup.setup({
88
89
  connection: remote,
89
90
  report,
@@ -119,13 +120,15 @@ let DevContainerConnectionProvider = class DevContainerConnectionProvider {
119
120
  getDevContainerFiles(workspacePath) {
120
121
  return this.devContainerFileService.getAvailableFiles(workspacePath);
121
122
  }
122
- async createContainerConnection(container, docker, name) {
123
+ async createContainerConnection(container, docker, config) {
124
+ var _a;
123
125
  return Promise.resolve(new RemoteDockerContainerConnection({
124
126
  id: (0, core_1.generateUuid)(),
125
- name: name !== null && name !== void 0 ? name : 'dev-container',
127
+ name: (_a = config.name) !== null && _a !== void 0 ? _a : 'dev-container',
126
128
  type: 'Dev Container',
127
129
  docker,
128
130
  container,
131
+ config,
129
132
  }));
130
133
  }
131
134
  async getCurrentContainerInfo(port) {
@@ -183,6 +186,7 @@ class RemoteDockerContainerConnection {
183
186
  this.name = options.name;
184
187
  this.docker = options.docker;
185
188
  this.container = options.container;
189
+ this.config = options.config;
186
190
  this.docker.getEvents({ filters: { container: [this.container.id], event: ['stop'] } }).then(stream => {
187
191
  stream.on('data', () => this.onDidDisconnectEmitter.fire());
188
192
  });
@@ -245,6 +249,7 @@ class RemoteDockerContainerConnection {
245
249
  });
246
250
  const stdout = new stream_1.PassThrough();
247
251
  stdout.on('data', (data) => {
252
+ this.logger.debug('REMOTE STDOUT:', data.toString());
248
253
  if (deferred.state === 'unresolved') {
249
254
  stdoutBuffer += data.toString();
250
255
  if (tester(stdoutBuffer, stderrBuffer)) {
@@ -254,6 +259,7 @@ class RemoteDockerContainerConnection {
254
259
  });
255
260
  const stderr = new stream_1.PassThrough();
256
261
  stderr.on('data', (data) => {
262
+ this.logger.debug('REMOTE STDERR:', data.toString());
257
263
  if (deferred.state === 'unresolved') {
258
264
  stderrBuffer += data.toString();
259
265
  if (tester(stdoutBuffer, stderrBuffer)) {
@@ -305,13 +311,38 @@ class RemoteDockerContainerConnection {
305
311
  return deferred.promise;
306
312
  }
307
313
  disposeSync() {
308
- const remoteHost = this.getDockerHost();
309
314
  // cant use dockerrode here since this needs to happen on one tick
310
- (0, child_process_1.execSync)(`docker ${remoteHost}stop ${this.container.id}`);
315
+ this.shutdownContainer(true);
311
316
  }
312
317
  async dispose() {
313
- return this.container.stop();
318
+ await this.shutdownContainer(false);
319
+ }
320
+ async shutdownContainer(sync) {
321
+ var _a;
322
+ const remoteHost = this.getDockerHost();
323
+ const shutdownAction = ((_a = this.config.shutdownAction) !== null && _a !== void 0 ? _a : this.config.dockerComposeFile) ? 'stopCompose' : 'stopContainer';
324
+ if (shutdownAction === 'stopContainer') {
325
+ return sync ? (0, child_process_1.execSync)(`docker ${remoteHost}stop ${this.container.id}`) : this.container.stop();
326
+ }
327
+ else if (shutdownAction === 'stopCompose') {
328
+ const composeFilePath = (0, compose_service_1.resolveComposeFilePath)(this.config);
329
+ return sync ? (0, child_process_1.execSync)(`docker ${remoteHost}compose -f ${composeFilePath} stop`) :
330
+ new Promise((res, rej) => (0, child_process_1.exec)(`docker ${remoteHost}compose -f ${composeFilePath} stop`, err => {
331
+ if (err) {
332
+ console.error(err);
333
+ rej(err);
334
+ }
335
+ else {
336
+ res();
337
+ }
338
+ }));
339
+ }
314
340
  }
315
341
  }
316
342
  exports.RemoteDockerContainerConnection = RemoteDockerContainerConnection;
343
+ tslib_1.__decorate([
344
+ (0, inversify_1.inject)(core_1.ILogger),
345
+ (0, inversify_1.named)('dev-container'),
346
+ tslib_1.__metadata("design:type", Object)
347
+ ], RemoteDockerContainerConnection.prototype, "logger", void 0);
317
348
  //# sourceMappingURL=remote-container-connection-provider.js.map
package/lib/electron-node/remote-container-connection-provider.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"remote-container-connection-provider.js","sourceRoot":"","sources":["../../src/electron-node/remote-container-connection-provider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"remote-container-connection-provider.js","sourceRoot":"","sources":["../../src/electron-node/remote-container-connection-provider.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.67.0-next.3+7946ca874",
3
+ "version": "1.67.0-next.59+3f14297ea",
4
4
  "description": "Theia - Editor Preview Extension",
5
5
  "dependencies": {
6
- "@theia/core": "1.67.0-next.3+7946ca874",
7
- "@theia/output": "1.67.0-next.3+7946ca874",
8
- "@theia/remote": "1.67.0-next.3+7946ca874",
9
- "@theia/workspace": "1.67.0-next.3+7946ca874",
6
+ "@theia/core": "1.67.0-next.59+3f14297ea",
7
+ "@theia/output": "1.67.0-next.59+3f14297ea",
8
+ "@theia/remote": "1.67.0-next.59+3f14297ea",
9
+ "@theia/workspace": "1.67.0-next.59+3f14297ea",
10
10
  "dockerode": "^4.0.2",
11
11
  "jsonc-parser": "^2.2.0",
12
12
  "uuid": "^8.0.0"
@@ -51,5 +51,5 @@
51
51
  "nyc": {
52
52
  "extends": "../../configs/nyc.json"
53
53
  },
54
- "gitHead": "7946ca874b04e6249d883e9a586f193194df1365"
54
+ "gitHead": "3f14297ea2edcdb1fffd74afee0613e70b43e125"
55
55
  }
package/src/electron-browser/container-info-contribution.ts CHANGED
@@ -44,13 +44,13 @@ export class ContainerInfoContribution implements FrontendApplicationContributio
44
44
  const containerInfo = await this.connectionProvider.getCurrentContainerInfo(containerPort);
45
45
  this.status = await this.remoteStatusService.getStatus(containerPort);
46
46
 
47
- this.portForwardingService.forwardedPorts = Object.entries(containerInfo?.NetworkSettings.Ports ?? {}).flatMap(([_, ports]) => (
47
+ this.portForwardingService.forwardedPorts.push(...Object.entries(containerInfo?.NetworkSettings.Ports ?? {}).flatMap(([_, ports]) => (
48
48
  ports.map(port => ({
49
49
  editing: false,
50
50
  address: port.HostIp ?? '',
51
51
  localPort: parseInt(port.HostPort ?? '0'),
52
52
  origin: 'container'
53
- }))));
53
+ })))));
54
54
  }
55
55
 
56
56
  enhanceTitle(title: string, parts: Map<string, string | undefined>): string {
package/src/electron-node/dev-container-backend-module.ts CHANGED
@@ -29,6 +29,7 @@ import { ProfileFileModificationContribution } from './devcontainer-contribution
29
29
  import { DevContainerWorkspaceHandler } from './dev-container-workspace-handler';
30
30
  import { WorkspaceHandlerContribution } from '@theia/workspace/lib/node/default-workspace-server';
31
31
  import { registerVariableResolverContributions, VariableResolverContribution } from './devcontainer-contributions/variable-resolver-contribution';
32
+ import { DockerComposeService } from './docker-compose/compose-service';
32
33
 
33
34
  export const remoteConnectionModule = ConnectionContainerModule.create(({ bind, bindBackendService }) => {
34
35
  bindContributionProvider(bind, ContainerCreationContribution);
@@ -54,6 +55,8 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
54
55
  bind(DockerContainerService).toSelf().inSingletonScope();
55
56
  bind(ConnectionContainerModule).toConstantValue(remoteConnectionModule);
56
57
 
58
+ bind(DockerComposeService).toSelf().inSingletonScope();
59
+
57
60
  bind(DevContainerFileService).toSelf().inSingletonScope();
58
61
 
59
62
  bind(ExtensionsContribution).toSelf().inSingletonScope();
package/src/electron-node/devcontainer-file.ts CHANGED
@@ -161,6 +161,10 @@ export interface ComposeContainer {
161
161
  * Whether to overwrite the command specified in the image. The default is false.
162
162
  */
163
163
  overrideCommand?: boolean
164
+ /**
165
+ * Allows passing additional arguments to the 'docker compose up' command.
166
+ */
167
+ composeUpArgs?: string[]
164
168
  [k: string]: unknown
165
169
  }
166
170
 
package/src/electron-node/docker-compose/compose-service.ts ADDED
@@ -0,0 +1,79 @@
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 { injectable } from '@theia/core/shared/inversify';
18
+ import * as Docker from 'dockerode';
19
+ import { ComposeContainer, DevContainerConfiguration } from '../devcontainer-file';
20
+ import { ContainerOutputProvider } from '../../electron-common/container-output-provider';
21
+ import { spawn } from 'child_process';
22
+ import path = require('path');
23
+
24
+ @injectable()
25
+ export class DockerComposeService {
26
+
27
+ async createContainers(
28
+ devcontainerConfig: DevContainerConfiguration,
29
+ containerCreateOptions: Docker.ContainerCreateOptions,
30
+ outputProvider?: ContainerOutputProvider): Promise<string> {
31
+
32
+ if (!devcontainerConfig.dockerComposeFile || typeof devcontainerConfig.dockerComposeFile !== 'string') {
33
+ throw new Error('dockerComposeFile is not defined in devcontainer configuration. Multiple files are not supported currently');
34
+ }
35
+
36
+ const dockerComposeFilePath = resolveComposeFilePath(devcontainerConfig);
37
+
38
+ const composeUpArgs = Array.isArray(devcontainerConfig.composeUpArgs) ? devcontainerConfig.composeUpArgs : [];
39
+ await this.executeComposeCommand(dockerComposeFilePath, 'up', ['--detach', ...composeUpArgs], outputProvider);
40
+
41
+ return (devcontainerConfig as ComposeContainer).service;
42
+ }
43
+
44
+ protected executeComposeCommand(composeFilePath: string, command: string, args: string[], outputProvider?: ContainerOutputProvider): Promise<string> {
45
+ return new Promise<string>((resolve, reject) => {
46
+ const process = spawn('docker', ['compose', '-f', composeFilePath, command, ...args]);
47
+ process.stdout.on('data', data => {
48
+ outputProvider?.onRemoteOutput(data.toString());
49
+ });
50
+ process.stderr.on('data', data => {
51
+ outputProvider?.onRemoteOutput(data.toString());
52
+ });
53
+ process.on('close', code => {
54
+ outputProvider?.onRemoteOutput(`docker compose process exited with code ${code}`);
55
+ if (code === 0) {
56
+ resolve(''); // TODO return real container ids
57
+ } else {
58
+ reject(new Error(`docker compose process exited with code ${code}`));
59
+ }
60
+ });
61
+ });
62
+ }
63
+ }
64
+
65
+ export function resolveComposeFilePath(devcontainerConfig: DevContainerConfiguration): string {
66
+ if (!devcontainerConfig.dockerComposeFile) {
67
+ throw new Error('dockerComposeFile is not defined in devcontainer configuration.');
68
+ }
69
+
70
+ if (typeof devcontainerConfig.dockerComposeFile !== 'string') {
71
+ throw new Error('Multiple docker compose files are not supported currently.');
72
+ }
73
+
74
+ if (path.isAbsolute(devcontainerConfig.dockerComposeFile)) {
75
+ return devcontainerConfig.dockerComposeFile;
76
+ } else {
77
+ return path.resolve(path.dirname(devcontainerConfig.location!), devcontainerConfig.dockerComposeFile);
78
+ }
79
+ }
package/src/electron-node/docker-container-service.ts CHANGED
@@ -24,6 +24,7 @@ import { DevContainerConfiguration } from './devcontainer-file';
24
24
  import { DevContainerFileService } from './dev-container-file-service';
25
25
  import { ContainerOutputProvider } from '../electron-common/container-output-provider';
26
26
  import { RemoteDockerContainerConnection } from './remote-container-connection-provider';
27
+ import { DockerComposeService } from './docker-compose/compose-service';
27
28
 
28
29
  export const ContainerCreationContribution = Symbol('ContainerCreationContributions');
29
30
 
@@ -60,6 +61,9 @@ export class DockerContainerService {
60
61
  @inject(DevContainerFileService)
61
62
  protected readonly devContainerFileService: DevContainerFileService;
62
63
 
64
+ @inject(DockerComposeService)
65
+ protected readonly dockerComposeService: DockerComposeService;
66
+
63
67
  container: Docker.Container | undefined;
64
68
 
65
69
  async getOrCreateContainer(docker: Docker, options: ContainerConnectionOptions, outputProvider?: ContainerOutputProvider): Promise<Docker.Container> {
@@ -121,9 +125,19 @@ export class DockerContainerService {
121
125
  await containerCreateContrib.handleContainerCreation?.(containerCreateOptions, devcontainerConfig, docker, outputProvider);
122
126
  }
123
127
 
124
- // TODO add more config
125
- const container = await docker.createContainer(containerCreateOptions);
126
- await container.start();
128
+ let container: Docker.Container;
129
+
130
+ if (devcontainerConfig.dockerComposeFile) {
131
+ const containerName = await this.dockerComposeService.createContainers(devcontainerConfig, containerCreateOptions, outputProvider);
132
+ const services = await docker.listContainers({ filters: { label: [`com.docker.compose.service=${containerName}`] } });
133
+ if (services.length === 0) {
134
+ throw new Error(`No running container found for docker compose service ${containerName}`);
135
+ }
136
+ container = docker.getContainer(services[0].Id);
137
+ } else {
138
+ container = await docker.createContainer(containerCreateOptions);
139
+ await container.start();
140
+ }
127
141
 
128
142
  for (const containerCreateContrib of this.containerCreationContributions.getContributions()) {
129
143
  await containerCreateContrib.handlePostCreate?.(devcontainerConfig, container, docker, outputProvider);
@@ -131,4 +145,5 @@ export class DockerContainerService {
131
145
 
132
146
  return container;
133
147
  }
148
+
134
149
  }
package/src/electron-node/remote-container-connection-provider.ts CHANGED
@@ -25,7 +25,7 @@ import { RemoteConnectionService } from '@theia/remote/lib/electron-node/remote-
25
25
  import { RemoteProxyServerProvider } from '@theia/remote/lib/electron-node/remote-proxy-server-provider';
26
26
  import { Emitter, Event, generateUuid, MessageService, RpcServer, ILogger } from '@theia/core';
27
27
  import { Socket } from 'net';
28
- import { inject, injectable } from '@theia/core/shared/inversify';
28
+ import { inject, injectable, named } from '@theia/core/shared/inversify';
29
29
  import * as Docker from 'dockerode';
30
30
  import { DockerContainerService } from './docker-container-service';
31
31
  import { Deferred } from '@theia/core/lib/common/promise-util';
@@ -34,6 +34,8 @@ import { PassThrough } from 'stream';
34
34
  import { exec, execSync } from 'child_process';
35
35
  import { DevContainerFileService } from './dev-container-file-service';
36
36
  import { ContainerOutputProvider } from '../electron-common/container-output-provider';
37
+ import { DevContainerConfiguration } from './devcontainer-file';
38
+ import { resolveComposeFilePath } from './docker-compose/compose-service';
37
39
 
38
40
  @injectable()
39
41
  export class DevContainerConnectionProvider implements RemoteContainerConnectionProvider, RpcServer<ContainerOutputProvider> {
@@ -121,7 +123,7 @@ export class DevContainerConnectionProvider implements RemoteContainerConnection
121
123
  const report: RemoteStatusReport = message => progress.report({ message });
122
124
  report('Connecting to remote system...');
123
125
 
124
- const remote = await this.createContainerConnection(container, dockerConnection, devContainerConfig.name);
126
+ const remote = await this.createContainerConnection(container, dockerConnection, devContainerConfig);
125
127
  const result = await this.remoteSetup.setup({
126
128
  connection: remote,
127
129
  report,
@@ -160,13 +162,14 @@ export class DevContainerConnectionProvider implements RemoteContainerConnection
160
162
  return this.devContainerFileService.getAvailableFiles(workspacePath);
161
163
  }
162
164
 
163
- async createContainerConnection(container: Docker.Container, docker: Docker, name?: string): Promise<RemoteDockerContainerConnection> {
165
+ async createContainerConnection(container: Docker.Container, docker: Docker, config: DevContainerConfiguration): Promise<RemoteDockerContainerConnection> {
164
166
  return Promise.resolve(new RemoteDockerContainerConnection({
165
167
  id: generateUuid(),
166
- name: name ?? 'dev-container',
168
+ name: config.name ?? 'dev-container',
167
169
  type: 'Dev Container',
168
170
  docker,
169
171
  container,
172
+ config,
170
173
  }));
171
174
  }
172
175
 
@@ -190,6 +193,7 @@ export interface RemoteContainerConnectionOptions {
190
193
  type: string;
191
194
  docker: Docker;
192
195
  container: Docker.Container;
196
+ config: DevContainerConfiguration;
193
197
  }
194
198
 
195
199
  interface ContainerTerminalSession {
@@ -208,6 +212,9 @@ interface ContainerTerminalSession {
208
212
 
209
213
  export class RemoteDockerContainerConnection implements RemoteConnection {
210
214
 
215
+ @inject(ILogger) @named('dev-container')
216
+ protected readonly logger: ILogger;
217
+
211
218
  id: string;
212
219
  name: string;
213
220
  type: string;
@@ -219,6 +226,8 @@ export class RemoteDockerContainerConnection implements RemoteConnection {
219
226
 
220
227
  remoteSetupResult: RemoteSetupResult;
221
228
 
229
+ protected config: DevContainerConfiguration;
230
+
222
231
  protected activeTerminalSession: ContainerTerminalSession | undefined;
223
232
 
224
233
  protected readonly onDidDisconnectEmitter = new Emitter<void>();
@@ -232,6 +241,8 @@ export class RemoteDockerContainerConnection implements RemoteConnection {
232
241
  this.docker = options.docker;
233
242
  this.container = options.container;
234
243
 
244
+ this.config = options.config;
245
+
235
246
  this.docker.getEvents({ filters: { container: [this.container.id], event: ['stop'] } }).then(stream => {
236
247
  stream.on('data', () => this.onDidDisconnectEmitter.fire());
237
248
  });
@@ -295,6 +306,7 @@ export class RemoteDockerContainerConnection implements RemoteConnection {
295
306
  });
296
307
  const stdout = new PassThrough();
297
308
  stdout.on('data', (data: Buffer) => {
309
+ this.logger.debug('REMOTE STDOUT:', data.toString());
298
310
  if (deferred.state === 'unresolved') {
299
311
  stdoutBuffer += data.toString();
300
312
 
@@ -305,6 +317,7 @@ export class RemoteDockerContainerConnection implements RemoteConnection {
305
317
  });
306
318
  const stderr = new PassThrough();
307
319
  stderr.on('data', (data: Buffer) => {
320
+ this.logger.debug('REMOTE STDERR:', data.toString());
308
321
  if (deferred.state === 'unresolved') {
309
322
  stderrBuffer += data.toString();
310
323
 
@@ -359,13 +372,34 @@ export class RemoteDockerContainerConnection implements RemoteConnection {
359
372
  }
360
373
 
361
374
  disposeSync(): void {
362
- const remoteHost = this.getDockerHost();
363
375
  // cant use dockerrode here since this needs to happen on one tick
364
- execSync(`docker ${remoteHost}stop ${this.container.id}`);
376
+ this.shutdownContainer(true);
365
377
  }
366
378
 
367
379
  async dispose(): Promise<void> {
368
- return this.container.stop();
380
+ await this.shutdownContainer(false);
381
+ }
382
+
383
+ protected async shutdownContainer(sync: boolean): Promise<unknown> {
384
+ const remoteHost = this.getDockerHost();
385
+
386
+ const shutdownAction = this.config.shutdownAction ?? this.config.dockerComposeFile ? 'stopCompose' : 'stopContainer';
387
+
388
+ if (shutdownAction === 'stopContainer') {
389
+ return sync ? execSync(`docker ${remoteHost}stop ${this.container.id}`) : this.container.stop();
390
+ } else if (shutdownAction === 'stopCompose') {
391
+ const composeFilePath = resolveComposeFilePath(this.config);
392
+ return sync ? execSync(`docker ${remoteHost}compose -f ${composeFilePath} stop`) :
393
+ new Promise<void>((res, rej) => exec(`docker ${remoteHost}compose -f ${composeFilePath} stop`, err => {
394
+ if (err) {
395
+ console.error(err);
396
+ rej(err);
397
+ } else {
398
+ res();
399
+ }
400
+ }));
401
+ }
402
+
369
403
  }
370
404
 
371
405
  }