From 5e6c45742c6f2a3a55d75a11137417f34e9997bc Mon Sep 17 00:00:00 2001 From: Kyle Brennan Date: Thu, 26 Mar 2026 23:30:48 +0000 Subject: [PATCH] Fix NLS mismatch in debug workspaces The REH server COPY overlays /vscode-reh-linux-x64/ onto /vscode-web/ in /ide/, overwriting the web client's NLS files with the REH server's version. Normal workspaces are unaffected because blobserve reads only the first Docker layer. Debug workspaces serve from the merged filesystem, causing workbench.js to reference NLS indices that don't exist in the REH's nls.messages.js. Restore the web client NLS files after the REH overlay. Co-authored-by: Ona --- components/ide/code/leeway.Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/components/ide/code/leeway.Dockerfile b/components/ide/code/leeway.Dockerfile index 9e0da32cee2059..312cc109ad599d 100644 --- a/components/ide/code/leeway.Dockerfile +++ b/components/ide/code/leeway.Dockerfile @@ -148,6 +148,11 @@ FROM scratch # copy static web resources in first layer to serve from blobserve COPY --from=code_builder --chown=33333:33333 /vscode-web/ /ide/ COPY --from=code_builder --chown=33333:33333 /vscode-reh-linux-x64/ /ide/ +# Restore web client NLS files overwritten by REH copy +COPY --from=code_builder --chown=33333:33333 /vscode-web/out/nls.messages.js /ide/out/nls.messages.js +COPY --from=code_builder --chown=33333:33333 /vscode-web/out/nls.messages.json /ide/out/nls.messages.json +COPY --from=code_builder --chown=33333:33333 /vscode-web/out/nls.keys.json /ide/out/nls.keys.json +COPY --from=code_builder --chown=33333:33333 /vscode-web/out/nls.metadata.json /ide/out/nls.metadata.json ARG CODE_VERSION ARG CODE_COMMIT