@theia/dev-container 1.49.0 → 1.50.0

package/lib/electron-node/remote-container-connection-provider.js

@@ -45,10 +45,11 @@ let DevContainerConnectionProvider = class DevContainerConnectionProvider {
         });
         try {
             const container = await this.containerService.getOrCreateContainer(dockerConnection, options.devcontainerFile, options.lastContainerInfo, this.outputProvider);
+            const devContainerConfig = await this.devContainerFileService.getConfiguration(options.devcontainerFile);
             // create actual connection
             const report = message => progress.report({ message });
             report('Connecting to remote system...');
-            const remote = await this.createContainerConnection(container, dockerConnection);
+            const remote = await this.createContainerConnection(container, dockerConnection, devContainerConfig.name);
             const result = await this.remoteSetup.setup({
                 connection: remote,
                 report,
@@ -65,6 +66,7 @@ let DevContainerConnectionProvider = class DevContainerConnectionProvider {
             });
             const localPort = server.address().port;
             remote.localPort = localPort;
+            await this.containerService.postConnect(options.devcontainerFile, remote, this.outputProvider);
             return {
                 containerId: container.id,
                 workspacePath: (await container.inspect()).Mounts[0].Destination,
@@ -83,46 +85,57 @@ let DevContainerConnectionProvider = class DevContainerConnectionProvider {
     getDevContainerFiles() {
         return this.devContainerFileService.getAvailableFiles();
     }
-    async createContainerConnection(container, docker) {
+    async createContainerConnection(container, docker, name) {
         return Promise.resolve(new RemoteDockerContainerConnection({
             id: (0, core_1.generateUuid)(),
-            name: 'dev-container',
-            type: 'container',
+            name: name !== null && name !== void 0 ? name : 'dev-container',
+            type: 'Dev Container',
             docker,
             container,
         }));
     }
+    async getCurrentContainerInfo(port) {
+        const connection = this.remoteConnectionService.getConnectionFromPort(port);
+        if (!connection || !(connection instanceof RemoteDockerContainerConnection)) {
+            return undefined;
+        }
+        return connection.container.inspect();
+    }
     dispose() {
     }
 };
-(0, tslib_1.__decorate)([
+exports.DevContainerConnectionProvider = DevContainerConnectionProvider;
+tslib_1.__decorate([
     (0, inversify_1.inject)(remote_connection_service_1.RemoteConnectionService),
-    (0, tslib_1.__metadata)("design:type", remote_connection_service_1.RemoteConnectionService)
+    tslib_1.__metadata("design:type", remote_connection_service_1.RemoteConnectionService)
 ], DevContainerConnectionProvider.prototype, "remoteConnectionService", void 0);
-(0, tslib_1.__decorate)([
+tslib_1.__decorate([
     (0, inversify_1.inject)(remote_setup_service_1.RemoteSetupService),
-    (0, tslib_1.__metadata)("design:type", remote_setup_service_1.RemoteSetupService)
+    tslib_1.__metadata("design:type", remote_setup_service_1.RemoteSetupService)
 ], DevContainerConnectionProvider.prototype, "remoteSetup", void 0);
-(0, tslib_1.__decorate)([
+tslib_1.__decorate([
     (0, inversify_1.inject)(core_1.MessageService),
-    (0, tslib_1.__metadata)("design:type", core_1.MessageService)
+    tslib_1.__metadata("design:type", core_1.MessageService)
 ], DevContainerConnectionProvider.prototype, "messageService", void 0);
-(0, tslib_1.__decorate)([
+tslib_1.__decorate([
     (0, inversify_1.inject)(remote_proxy_server_provider_1.RemoteProxyServerProvider),
-    (0, tslib_1.__metadata)("design:type", remote_proxy_server_provider_1.RemoteProxyServerProvider)
+    tslib_1.__metadata("design:type", remote_proxy_server_provider_1.RemoteProxyServerProvider)
 ], DevContainerConnectionProvider.prototype, "serverProvider", void 0);
-(0, tslib_1.__decorate)([
+tslib_1.__decorate([
     (0, inversify_1.inject)(docker_container_service_1.DockerContainerService),
-    (0, tslib_1.__metadata)("design:type", docker_container_service_1.DockerContainerService)
+    tslib_1.__metadata("design:type", docker_container_service_1.DockerContainerService)
 ], DevContainerConnectionProvider.prototype, "containerService", void 0);
-(0, tslib_1.__decorate)([
+tslib_1.__decorate([
     (0, inversify_1.inject)(dev_container_file_service_1.DevContainerFileService),
-    (0, tslib_1.__metadata)("design:type", dev_container_file_service_1.DevContainerFileService)
+    tslib_1.__metadata("design:type", dev_container_file_service_1.DevContainerFileService)
 ], DevContainerConnectionProvider.prototype, "devContainerFileService", void 0);
-DevContainerConnectionProvider = (0, tslib_1.__decorate)([
+tslib_1.__decorate([
+    (0, inversify_1.inject)(remote_connection_service_1.RemoteConnectionService),
+    tslib_1.__metadata("design:type", remote_connection_service_1.RemoteConnectionService)
+], DevContainerConnectionProvider.prototype, "remoteService", void 0);
+exports.DevContainerConnectionProvider = DevContainerConnectionProvider = tslib_1.__decorate([
     (0, inversify_1.injectable)()
 ], DevContainerConnectionProvider);
-exports.DevContainerConnectionProvider = DevContainerConnectionProvider;
 class RemoteDockerContainerConnection {
     constructor(options) {
         this.onDidDisconnectEmitter = new core_1.Emitter();
@@ -130,9 +143,11 @@ class RemoteDockerContainerConnection {
         this.id = options.id;
         this.type = options.type;
         this.name = options.name;
-        this.onDidDisconnect(() => this.dispose());
         this.docker = options.docker;
         this.container = options.container;
+        this.docker.getEvents({ filters: { container: [this.container.id], event: ['stop'] } }).then(stream => {
+            stream.on('data', () => this.onDidDisconnectEmitter.fire());
+        });
     }
     async forwardOut(socket, port) {
         const node = `${this.remoteSetupResult.nodeDirectory}/bin/node`;
@@ -233,8 +248,9 @@ class RemoteDockerContainerConnection {
         });
         return deferred.promise;
     }
-    dispose() {
-        this.container.stop();
+    async dispose() {
+        // cant use dockerrode here since this needs to happen on one tick
+        (0, child_process_1.exec)(`docker stop ${this.container.id}`);
     }
 }
 exports.RemoteDockerContainerConnection = RemoteDockerContainerConnection;

package/lib/electron-node/remote-container-connection-provider.js.map

@@ -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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"}
+{"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

@@ -1,12 +1,12 @@
 {
   "name": "@theia/dev-container",
-  "version": "1.49.0",
+  "version": "1.50.0",
   "description": "Theia - Editor Preview Extension",
   "dependencies": {
-    "@theia/core": "1.49.0",
-    "@theia/output": "1.49.0",
-    "@theia/remote": "1.49.0",
-    "@theia/workspace": "1.49.0",
+    "@theia/core": "1.50.0",
+    "@theia/output": "1.50.0",
+    "@theia/remote": "1.50.0",
+    "@theia/workspace": "1.50.0",
     "dockerode": "^4.0.2",
     "jsonc-parser": "^2.2.0",
     "uuid": "^8.0.0"
@@ -45,11 +45,11 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.49.0",
+    "@theia/ext-scripts": "1.50.0",
     "@types/dockerode": "^3.3.23"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "d413dadd87a70fce1c80df7eb22d9d2529cc129f"
+  "gitHead": "63585530b2e32af0ed4bac4edb5ff443bfc248b7"
 }

package/src/electron-browser/container-info-contribution.ts

@@ -0,0 +1,46 @@
+// *****************************************************************************
+// Copyright (C) 2024 Typefox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser';
+import type { ContainerInspectInfo } from 'dockerode';
+import { RemoteContainerConnectionProvider } from '../electron-common/remote-container-connection-provider';
+import { PortForwardingService } from '@theia/remote/lib/electron-browser/port-forwarding/port-forwarding-service';
+
+@injectable()
+export class ContainerInfoContribution implements FrontendApplicationContribution {
+
+    @inject(RemoteContainerConnectionProvider)
+    protected readonly connectionProvider: RemoteContainerConnectionProvider;
+
+    @inject(PortForwardingService)
+    protected readonly portForwardingService: PortForwardingService;
+
+    containerInfo: ContainerInspectInfo | undefined;
+
+    async onStart(): Promise<void> {
+        this.containerInfo = await this.connectionProvider.getCurrentContainerInfo(parseInt(new URLSearchParams(location.search).get('port') ?? '0'));
+
+        this.portForwardingService.forwardedPorts = Object.entries(this.containerInfo?.NetworkSettings.Ports ?? {}).flatMap(([_, ports]) => (
+            ports.map(port => ({
+                editing: false,
+                address: port.HostIp ?? '',
+                localPort: parseInt(port.HostPort ?? '0'),
+                origin: 'container'
+            }))));
+    }
+
+}

package/src/electron-browser/dev-container-frontend-module.ts

@@ -19,6 +19,8 @@ import { RemoteContainerConnectionProvider, RemoteContainerConnectionProviderPat
 import { ContainerConnectionContribution } from './container-connection-contribution';
 import { ServiceConnectionProvider } from '@theia/core/lib/browser/messaging/service-connection-provider';
 import { ContainerOutputProvider } from './container-output-provider';
+import { ContainerInfoContribution } from './container-info-contribution';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser';
 
 export default new ContainerModule(bind => {
     bind(ContainerConnectionContribution).toSelf().inSingletonScope();
@@ -30,4 +32,7 @@ export default new ContainerModule(bind => {
         const outputProvider = ctx.container.get(ContainerOutputProvider);
         return ServiceConnectionProvider.createLocalProxy<RemoteContainerConnectionProvider>(ctx.container, RemoteContainerConnectionProviderPath, outputProvider);
     }).inSingletonScope();
+
+    bind(ContainerInfoContribution).toSelf().inSingletonScope();
+    bind(FrontendApplicationContribution).toService(ContainerInfoContribution);
 });

package/src/electron-common/remote-container-connection-provider.ts

@@ -15,6 +15,7 @@
 
 import { RpcServer } from '@theia/core';
 import { ContainerOutputProvider } from './container-output-provider';
+import type { ContainerInspectInfo } from 'dockerode';
 
 // *****************************************************************************
 export const RemoteContainerConnectionProviderPath = '/remote/container';
@@ -46,4 +47,5 @@ export interface DevContainerFile {
 export interface RemoteContainerConnectionProvider extends RpcServer<ContainerOutputProvider> {
     connectToContainer(options: ContainerConnectionOptions): Promise<ContainerConnectionResult>;
     getDevContainerFiles(): Promise<DevContainerFile[]>;
+    getCurrentContainerInfo(port: number): Promise<ContainerInspectInfo | undefined>;
 }

package/src/electron-node/dev-container-backend-module.ts

@@ -23,10 +23,16 @@ import { bindContributionProvider, ConnectionHandler, RpcConnectionHandler } fro
 import { registerContainerCreationContributions } from './devcontainer-contributions/main-container-creation-contributions';
 import { DevContainerFileService } from './dev-container-file-service';
 import { ContainerOutputProvider } from '../electron-common/container-output-provider';
+import { ExtensionsContribution, registerTheiaStartOptionsContributions, SettingsContribution } from './devcontainer-contributions/cli-enhancing-creation-contributions';
+import { RemoteCliContribution } from '@theia/core/lib/node/remote/remote-cli-contribution';
+import { ProfileFileModificationContribution } from './devcontainer-contributions/profile-file-modification-contribution';
 
 export const remoteConnectionModule = ConnectionContainerModule.create(({ bind, bindBackendService }) => {
     bindContributionProvider(bind, ContainerCreationContribution);
     registerContainerCreationContributions(bind);
+    registerTheiaStartOptionsContributions(bind);
+    bind(ProfileFileModificationContribution).toSelf().inSingletonScope();
+    bind(ContainerCreationContribution).toService(ProfileFileModificationContribution);
 
     bind(DevContainerConnectionProvider).toSelf().inSingletonScope();
     bind(RemoteContainerConnectionProvider).toService(DevContainerConnectionProvider);
@@ -44,4 +50,9 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(ConnectionContainerModule).toConstantValue(remoteConnectionModule);
 
     bind(DevContainerFileService).toSelf().inSingletonScope();
+
+    bind(ExtensionsContribution).toSelf().inSingletonScope();
+    bind(SettingsContribution).toSelf().inSingletonScope();
+    bind(RemoteCliContribution).toService(ExtensionsContribution);
+    bind(RemoteCliContribution).toService(SettingsContribution);
 });

package/src/electron-node/devcontainer-contributions/cli-enhancing-creation-contributions.ts

@@ -0,0 +1,68 @@
+// *****************************************************************************
+// Copyright (C) 2024 Typefox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { RemoteCliContext, RemoteCliContribution } from '@theia/core/lib/node/remote/remote-cli-contribution';
+import { ContainerCreationContribution } from '../docker-container-service';
+import * as Docker from 'dockerode';
+import { DevContainerConfiguration, } from '../devcontainer-file';
+import { injectable, interfaces } from '@theia/core/shared/inversify';
+
+export function registerTheiaStartOptionsContributions(bind: interfaces.Bind): void {
+    bind(ContainerCreationContribution).toService(ExtensionsContribution);
+    bind(ContainerCreationContribution).toService(SettingsContribution);
+}
+
+@injectable()
+export class ExtensionsContribution implements RemoteCliContribution, ContainerCreationContribution {
+    protected currentConfig: DevContainerConfiguration | undefined;
+
+    enhanceArgs(context: RemoteCliContext): string[] {
+        if (!this.currentConfig) {
+            return [];
+        }
+        const extensions = [
+            ...(this.currentConfig.extensions ?? []),
+            ...(this.currentConfig.customizations?.vscode?.extensions ?? [])
+        ];
+        this.currentConfig = undefined;
+        return extensions?.map(extension => `--install-plugin=${extension}`);
+    }
+
+    async handleContainerCreation(createOptions: Docker.ContainerCreateOptions, containerConfig: DevContainerConfiguration): Promise<void> {
+        this.currentConfig = containerConfig;
+    }
+}
+
+@injectable()
+export class SettingsContribution implements RemoteCliContribution, ContainerCreationContribution {
+    protected currentConfig: DevContainerConfiguration | undefined;
+
+    enhanceArgs(context: RemoteCliContext): string[] {
+        if (!this.currentConfig) {
+            return [];
+        }
+        const settings = {
+            ...(this.currentConfig.settings ?? {}),
+            ...(this.currentConfig.customizations?.vscode?.settings ?? [])
+        };
+        this.currentConfig = undefined;
+        return Object.entries(settings).map(([key, value]) => `--set-preference=${key}=${JSON.stringify(value)}`) ?? [];
+    }
+
+    async handleContainerCreation(createOptions: Docker.ContainerCreateOptions, containerConfig: DevContainerConfiguration): Promise<void> {
+        this.currentConfig = containerConfig;
+    }
+}

package/src/electron-node/devcontainer-contributions/main-container-creation-contributions.ts

@@ -14,17 +14,22 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 import * as Docker from 'dockerode';
-import { injectable, interfaces } from '@theia/core/shared/inversify';
+import { inject, injectable, interfaces } from '@theia/core/shared/inversify';
 import { ContainerCreationContribution } from '../docker-container-service';
 import { DevContainerConfiguration, DockerfileContainer, ImageContainer, NonComposeContainerBase } from '../devcontainer-file';
 import { Path } from '@theia/core';
 import { ContainerOutputProvider } from '../../electron-common/container-output-provider';
+import * as fs from '@theia/core/shared/fs-extra';
+import { RemotePortForwardingProvider } from '@theia/remote/lib/electron-common/remote-port-forwarding-provider';
+import { RemoteDockerContainerConnection } from '../remote-container-connection-provider';
 
 export function registerContainerCreationContributions(bind: interfaces.Bind): void {
     bind(ContainerCreationContribution).to(ImageFileContribution).inSingletonScope();
     bind(ContainerCreationContribution).to(DockerFileContribution).inSingletonScope();
     bind(ContainerCreationContribution).to(ForwardPortsContribution).inSingletonScope();
     bind(ContainerCreationContribution).to(MountsContribution).inSingletonScope();
+    bind(ContainerCreationContribution).to(RemoteUserContribution).inSingletonScope();
+    bind(ContainerCreationContribution).to(PostCreateCommandContribution).inSingletonScope();
 }
 
 @injectable()
@@ -53,50 +58,62 @@ export class DockerFileContribution implements ContainerCreationContribution {
         // check if dockerfile container
         if (containerConfig.dockerFile || containerConfig.build?.dockerfile) {
             const dockerfile = (containerConfig.dockerFile ?? containerConfig.build?.dockerfile) as string;
-            const buildStream = await api.buildImage({
-                context: containerConfig.context ?? new Path(containerConfig.location as string).dir.fsPath(),
-                src: [dockerfile],
-            } as Docker.ImageBuildContext, {
-                buildargs: containerConfig.build?.args
-            });
-            // TODO probably have some console windows showing the output of the build
-            const imageId = await new Promise<string>((res, rej) => api.modem.followProgress(buildStream, (err, outputs) => {
-                if (err) {
-                    rej(err);
-                } else {
-                    for (let i = outputs.length - 1; i >= 0; i--) {
-                        if (outputs[i].aux?.ID) {
-                            res(outputs[i].aux.ID);
-                            return;
+            const context = containerConfig.context ?? new Path(containerConfig.location as string).dir.fsPath();
+            try {
+                // ensure dockerfile exists
+                await fs.lstat(new Path(context as string).join(dockerfile).fsPath());
+
+                const buildStream = await api.buildImage({
+                    context,
+                    src: [dockerfile],
+                } as Docker.ImageBuildContext, {
+                    buildargs: containerConfig.build?.args
+                });
+                // TODO probably have some console windows showing the output of the build
+                const imageId = await new Promise<string>((res, rej) => api.modem.followProgress(buildStream!, (err, outputs) => {
+                    if (err) {
+                        rej(err);
+                    } else {
+                        for (let i = outputs.length - 1; i >= 0; i--) {
+                            if (outputs[i].aux?.ID) {
+                                res(outputs[i].aux.ID);
+                                return;
+                            }
                         }
                     }
-                }
-            }, progress => outputprovider.onRemoteOutput(OutputHelper.parseProgress(progress))));
-            createOptions.Image = imageId;
+                }, progress => outputprovider.onRemoteOutput(OutputHelper.parseProgress(progress))));
+                createOptions.Image = imageId;
+            } catch (error) {
+                outputprovider.onRemoteOutput(`could not build dockerfile "${dockerfile}" reason: ${error.message}`);
+                throw error;
+            }
         }
     }
 }
 
 @injectable()
 export class ForwardPortsContribution implements ContainerCreationContribution {
-    async handleContainerCreation(createOptions: Docker.ContainerCreateOptions, containerConfig: DevContainerConfiguration, api: Docker): Promise<void> {
+
+    @inject(RemotePortForwardingProvider)
+    protected readonly portForwardingProvider: RemotePortForwardingProvider;
+
+    async handlePostConnect(containerConfig: DevContainerConfiguration, connection: RemoteDockerContainerConnection): Promise<void> {
         if (!containerConfig.forwardPorts) {
             return;
         }
 
-        for (const port of containerConfig.forwardPorts) {
-            let portKey: string;
-            let hostPort: string;
-            if (typeof port === 'string') {
-                const parts = port.split(':');
-                portKey = isNaN(+parts[0]) ? parts[0] : `${parts[0]}/tcp`;
-                hostPort = parts[1] ?? parts[0];
+        for (const forward of containerConfig.forwardPorts) {
+            let port: number;
+            let address: string | undefined;
+            if (typeof forward === 'string') {
+                const parts = forward.split(':');
+                address = parts[0];
+                port = parseInt(parts[1]);
             } else {
-                portKey = `${port}/tcp`;
-                hostPort = port.toString();
+                port = forward;
             }
-            createOptions.ExposedPorts![portKey] = {};
-            createOptions.HostConfig!.PortBindings[portKey] = [{ HostPort: hostPort }];
+
+            this.portForwardingProvider.forwardPort(connection.localPort, { port, address });
         }
 
     }
@@ -126,6 +143,40 @@ export class MountsContribution implements ContainerCreationContribution {
     }
 }
 
+@injectable()
+export class RemoteUserContribution implements ContainerCreationContribution {
+    async handleContainerCreation(createOptions: Docker.ContainerCreateOptions, containerConfig: DevContainerConfiguration, api: Docker): Promise<void> {
+        if (containerConfig.remoteUser) {
+            createOptions.User = containerConfig.remoteUser;
+        }
+    }
+}
+
+@injectable()
+export class PostCreateCommandContribution implements ContainerCreationContribution {
+    async handlePostCreate?(containerConfig: DevContainerConfiguration, container: Docker.Container, api: Docker, outputprovider: ContainerOutputProvider): Promise<void> {
+        if (containerConfig.postCreateCommand) {
+            const commands = typeof containerConfig.postCreateCommand === 'object' && !(containerConfig.postCreateCommand instanceof Array) ?
+                Object.values(containerConfig.postCreateCommand) : [containerConfig.postCreateCommand];
+            for (const command of commands) {
+                try {
+                    let exec;
+                    if (command instanceof Array) {
+                        exec = await container.exec({ Cmd: command, AttachStderr: true, AttachStdout: true });
+
+                    } else {
+                        exec = await container.exec({ Cmd: ['sh', '-c', command], AttachStderr: true, AttachStdout: true });
+                    }
+                    const stream = await exec.start({ Tty: true });
+                    stream.on('data', chunk => outputprovider.onRemoteOutput(chunk.toString()));
+                } catch (error) {
+                    outputprovider.onRemoteOutput('could not execute postCreateCommand ' + JSON.stringify(command) + ' reason:' + error.message);
+                }
+            }
+        }
+    }
+}
+
 export namespace OutputHelper {
     export interface Progress {
         id?: string;

package/src/electron-node/devcontainer-contributions/profile-file-modification-contribution.ts

@@ -0,0 +1,35 @@
+// *****************************************************************************
+// Copyright (C) 2024 Typefox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { DevContainerConfiguration } from '../devcontainer-file';
+import { ContainerCreationContribution } from '../docker-container-service';
+import * as Docker from 'dockerode';
+import { injectable } from '@theia/core/shared/inversify';
+import { ContainerOutputProvider } from '../../electron-common/container-output-provider';
+
+/**
+ * this contribution changes the /etc/profile file so that it won't overwrite the PATH variable set by docker
+ */
+@injectable()
+export class ProfileFileModificationContribution implements ContainerCreationContribution {
+    async handlePostCreate(containerConfig: DevContainerConfiguration, container: Docker.Container, api: Docker, outputprovider: ContainerOutputProvider): Promise<void> {
+        const stream = await (await container.exec({
+            Cmd: ['sh', '-c', 'sed -i \'s|PATH="\\([^"]*\\)"|PATH=${PATH:-"\\1"}|g\' /etc/profile'], User: 'root',
+            AttachStderr: true, AttachStdout: true
+        })).start({});
+        stream.on('data', data => outputprovider.onRemoteOutput(data.toString()));
+    }
+}

package/src/electron-node/devcontainer-file.ts

@@ -258,6 +258,21 @@ export interface DevContainerCommon {
      * The default is the same user as the container.
      */
     remoteUser?: string
+
+    /**
+     * extensions to install in the container at launch. The expeceted format is publisher.name[@version].
+     * The default is no extensions being installed.
+     */
+    extensions?: string[]
+
+    /**
+     * settings to set in the container at launch in the settings.json. The expected format is key=value.
+     * The default is no preferences being set.
+     */
+    settings?: {
+        [k: string]: unknown
+    }
+
     /**
      * A command to run locally before anything else. This command is run before 'onCreateCommand'.
      * If this is a single string, it will be run in a shell. If this is an array of strings, it will be run as a single command without shell.
@@ -365,7 +380,23 @@ export interface DevContainerCommon {
      * Tool-specific configuration. Each tool should use a JSON object subproperty with a unique name to group its customizations.
      */
     customizations?: {
-        [k: string]: unknown
+        [k: string]: unknown,
+        vscode?: {
+            /**
+             * extensions to install in the container at launch. The expeceted format is publisher.name[@version].
+             * The default is no extensions being installed.
+             */
+            extensions?: string[],
+
+            /**
+             * settings to set in the container at launch in the settings.json. The expected format is key=value.
+             * The default is no preferences being set.
+             */
+            settings?: {
+                [k: string]: unknown
+            }
+            [k: string]: unknown
+        }
     }
     additionalProperties?: {
         [k: string]: unknown