[server] Add DOCKERD_PROXY_ENABLED if feature flag "dockerd_proxy_ena…

…bled" is true Tool: gitpod/catfood.gitpod.cloud
gitpod-io · Jan 30, 2025 · 9577820 · 9577820
1 parent 2524442
commit 9577820
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/components/server/src/workspace/workspace-starter.ts b/components/server/src/workspace/workspace-starter.ts
@@ -632,7 +632,7 @@ export class WorkspaceStarter {
             }
 
             // build workspace image
-            const additionalAuth = await this.getAdditionalImageAuth(envVars);
+            const additionalAuth = this.getAdditionalImageAuth(envVars);
             instance = await this.buildWorkspaceImage(
                 { span },
                 user,
@@ -839,7 +839,7 @@ export class WorkspaceStarter {
         return undefined;
     }
 
-    private async getAdditionalImageAuth(envVars: ResolvedEnvVars): Promise<Map<string, string>> {
+    private getAdditionalImageAuth(envVars: ResolvedEnvVars): Map<string, string> {
         const res = new Map<string, string>();
         const imageAuth = envVars.workspace.find((e) => e.name === EnvVar.GITPOD_IMAGE_AUTH_ENV_VAR_NAME);
         if (!imageAuth) {
@@ -1493,6 +1493,18 @@ export class WorkspaceStarter {
             envvars.push(ev);
         })();
 
+        const isDockerdProxyEnabled = await getExperimentsClientForBackend().getValueAsync(
+            "dockerd_proxy_enabled",
+            false,
+            { user, projectId: workspace.projectId, gitpodHost: this.config.hostUrl.url.toString() },
+        );
+        if (isDockerdProxyEnabled) {
+            const ev = new EnvironmentVariable();
+            ev.setName("DOCKERD_PROXY_ENABLED");
+            ev.setValue("true");
+            envvars.push(ev);
+        }
+
         const portIndex = new Set<number>();
         const ports = (workspace.config.ports || [])
             .map((p) => {