From 815dc06118dc1430610bcf8ceb773f174a30336d Mon Sep 17 00:00:00 2001
From: Anmol Sethi <hi@nhooyr.io>
Date: Thu, 20 Feb 2020 19:11:01 -0500
Subject: [PATCH] Use npm rebuild instead of yarn --no-scripts in vscode.sh

---
 ci/release-image/Dockerfile | 11 ++++++-----
 ci/vscode.sh                |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ci/release-image/Dockerfile b/ci/release-image/Dockerfile
index f394af52..9e70a416 100644
--- a/ci/release-image/Dockerfile
+++ b/ci/release-image/Dockerfile
@@ -3,11 +3,6 @@ FROM debian:10
 RUN apt-get update
 RUN apt-get install -y curl
 
-COPY release/code-server*.tar.gz /tmp
-RUN cd /tmp && tar -xzf code-server*.tar.gz && \
-  cp code-server*/code-server /usr/local/bin/code-server
-RUN rm -rf /tmp/*
-
 # https://wiki.debian.org/Locale#Manually
 RUN apt-get install -y locales
 RUN sed -i "s/# en_US.UTF-8/en_US.UTF-8/" /etc/locale.gen
@@ -30,6 +25,12 @@ RUN curl -SsL https://github.com/boxboat/fixuid/releases/download/v0.4/fixuid-0.
     printf "user: coder\ngroup: coder\n" > /etc/fixuid/config.yml
 
 RUN rm -rf /var/lib/apt/lists/*
+
+COPY release/code-server*.tar.gz /tmp
+RUN cd /tmp && tar -xzf code-server*.tar.gz && \
+  cp code-server*/code-server /usr/local/bin/code-server
+RUN rm -rf /tmp/*
+
 EXPOSE 8080
 USER coder
 WORKDIR /home/coder
diff --git a/ci/vscode.sh b/ci/vscode.sh
index f8091ab3..c415e3fd 100755
--- a/ci/vscode.sh
+++ b/ci/vscode.sh
@@ -12,13 +12,13 @@ main() {
   # If the patch fails to apply, then it's likely already applied
   yarn vscode:patch &> /dev/null || true
 
-  # Install VS Code dependencies.
-  # The second yarn is required as for whatever reason, we get
-  # NODE_MODULE_VERSION mismatch errors without it.
   (
     cd lib/vscode
+    # Install VS Code dependencies.
     yarn
-    yarn --ignore-scripts
+
+    # NODE_MODULE_VERSION mismatch errors without this.
+    npm rebuild
   )
 }