Skip to content

Commit 815dc06

Browse files
committed
Use npm rebuild instead of yarn --no-scripts in vscode.sh
1 parent 3a2644a commit 815dc06

2 files changed

Lines changed: 10 additions & 9 deletions

File tree

ci/release-image/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ FROM debian:10
33
RUN apt-get update
44
RUN apt-get install -y curl
55

6-
COPY release/code-server*.tar.gz /tmp
7-
RUN cd /tmp && tar -xzf code-server*.tar.gz && \
8-
cp code-server*/code-server /usr/local/bin/code-server
9-
RUN rm -rf /tmp/*
10-
116
# https://wiki.debian.org/Locale#Manually
127
RUN apt-get install -y locales
138
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.
3025
printf "user: coder\ngroup: coder\n" > /etc/fixuid/config.yml
3126

3227
RUN rm -rf /var/lib/apt/lists/*
28+
29+
COPY release/code-server*.tar.gz /tmp
30+
RUN cd /tmp && tar -xzf code-server*.tar.gz && \
31+
cp code-server*/code-server /usr/local/bin/code-server
32+
RUN rm -rf /tmp/*
33+
3334
EXPOSE 8080
3435
USER coder
3536
WORKDIR /home/coder

ci/vscode.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ main() {
1212
# If the patch fails to apply, then it's likely already applied
1313
yarn vscode:patch &> /dev/null || true
1414

15-
# Install VS Code dependencies.
16-
# The second yarn is required as for whatever reason, we get
17-
# NODE_MODULE_VERSION mismatch errors without it.
1815
(
1916
cd lib/vscode
17+
# Install VS Code dependencies.
2018
yarn
21-
yarn --ignore-scripts
19+
20+
# NODE_MODULE_VERSION mismatch errors without this.
21+
npm rebuild
2222
)
2323
}
2424

0 commit comments

Comments
 (0)