Skip to content

Commit f6739e5

Browse files
kylos101ona-agent
andauthored
Fix NLS mismatch in debug workspaces (#21367)
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 <no-reply@ona.com>
1 parent e9642e9 commit f6739e5

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

components/ide/code/leeway.Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,11 @@ FROM scratch
148148
# copy static web resources in first layer to serve from blobserve
149149
COPY --from=code_builder --chown=33333:33333 /vscode-web/ /ide/
150150
COPY --from=code_builder --chown=33333:33333 /vscode-reh-linux-x64/ /ide/
151+
# Restore web client NLS files overwritten by REH copy
152+
COPY --from=code_builder --chown=33333:33333 /vscode-web/out/nls.messages.js /ide/out/nls.messages.js
153+
COPY --from=code_builder --chown=33333:33333 /vscode-web/out/nls.messages.json /ide/out/nls.messages.json
154+
COPY --from=code_builder --chown=33333:33333 /vscode-web/out/nls.keys.json /ide/out/nls.keys.json
155+
COPY --from=code_builder --chown=33333:33333 /vscode-web/out/nls.metadata.json /ide/out/nls.metadata.json
151156

152157
ARG CODE_VERSION
153158
ARG CODE_COMMIT

0 commit comments

Comments
 (0)