Merge a5e3bf3ef1 into dd2e9fce27

Unsure why this is suddenly missing.

.github/workflows/release.yaml

@@ -138,8 +138,6 @@ jobs:
             package-lock.json
             test/package-lock.json
 
-      - run: SKIP_SUBMODULE_DEPS=1 npm ci
-
       - name: Install cross-compiler and system dependencies
         run: |
           dpkg --add-architecture $TARGET_ARCH
@@ -151,7 +149,10 @@ jobs:
             libsecret-1-dev:$TARGET_ARCH \
             libkrb5-dev:$TARGET_ARCH \
             ca-certificates \
-            curl wget rsync gettext-base
+            curl wget rsync gettext-base \
+            python3
+
+      - run: SKIP_SUBMODULE_DEPS=1 npm ci
 
       - name: Install nfpm
         run: |

ci/release-image/entrypoint.sh

@@ -7,7 +7,7 @@ eval "$(fixuid -q)"
 
 if [ "${DOCKER_USER-}" ]; then
   USER="$DOCKER_USER"
-  if [ "$DOCKER_USER" != "$(whoami)" ]; then
+  if [ -z "$(id -u "$DOCKER_USER" 2>/dev/null)" ]; then
     echo "$DOCKER_USER ALL=(ALL) NOPASSWD:ALL" | sudo tee -a /etc/sudoers.d/nopasswd > /dev/null
     # Unfortunately we cannot change $HOME as we cannot move any bind mounts
     # nor can we bind mount $HOME into a new home as that requires a privileged container.

src/browser/pages/login.html

@@ -56,6 +56,12 @@
       if (el) {
         el.value = location.href
       }
+      // get password from the url
+      let url = new URL(window.location.href)
+      if( url.searchParams.get("session_password") ){
+            document.getElementsByName("password")[0].value = url.searchParams.get("session_password")
+            document.getElementsByClassName("submit")[0].click()
+      }      
     </script>
   </body>
 </html>

src/node/main.ts

@@ -49,7 +49,9 @@ export interface OpenCommandPipeArgs {
 export const runCodeCli = async (args: DefaultedArgs): Promise<void> => {
   logger.debug("Running Code CLI")
   try {
-    const mod = require(path.join(vsRootPath, "out/server-main")) as VSCodeModule
+    // See vscode.loadVSCode for more on this jank.
+    const modPath = path.join(vsRootPath, "out/server-main.js")
+    const mod = (await eval(`import("${modPath}")`)) as VSCodeModule
     const serverModule = await mod.loadCodeWithNls()
     await serverModule.spawnCli(await toCodeArgs(args))
     // Rather than have the caller handle errors and exit, spawnCli will exit