Use npm rebuild instead of yarn --no-scripts in vscode.sh

This commit is contained in:
Anmol Sethi 2020-02-20 19:11:01 -05:00
parent 3a2644a2bc
commit 815dc06118
No known key found for this signature in database
GPG Key ID: 8CEF1878FF10ADEB
2 changed files with 10 additions and 9 deletions

View File

@ -3,11 +3,6 @@ FROM debian:10
RUN apt-get update RUN apt-get update
RUN apt-get install -y curl 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 # https://wiki.debian.org/Locale#Manually
RUN apt-get install -y locales RUN apt-get install -y locales
RUN sed -i "s/# en_US.UTF-8/en_US.UTF-8/" /etc/locale.gen 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 printf "user: coder\ngroup: coder\n" > /etc/fixuid/config.yml
RUN rm -rf /var/lib/apt/lists/* 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 EXPOSE 8080
USER coder USER coder
WORKDIR /home/coder WORKDIR /home/coder

View File

@ -12,13 +12,13 @@ main() {
# If the patch fails to apply, then it's likely already applied # If the patch fails to apply, then it's likely already applied
yarn vscode:patch &> /dev/null || true 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 cd lib/vscode
# Install VS Code dependencies.
yarn yarn
yarn --ignore-scripts
# NODE_MODULE_VERSION mismatch errors without this.
npm rebuild
) )
} }