Skip to content

Commit 5c29584

Browse files
committed
Switch to new nodejs/npm/yarn in Dockerfile
1 parent 231ec4a commit 5c29584

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

ci/docker/Dockerfile.hybrid

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM ubuntu:focal
22
MAINTAINER Jan Bujak ([email protected])
33

44
RUN apt-get update && \
5-
DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends ca-certificates file gcc g++ git locales make qemu-user curl yarnpkg
5+
DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends ca-certificates file gcc g++ git locales make qemu-user curl
66

77
RUN locale-gen en_US.UTF-8 && \
88
update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
@@ -50,5 +50,10 @@ RUN [ $USE_HOST_RUSTC -eq 1 ] || run-if-enabled aarch64-unknown-linux-gnu "rustu
5050
RUN [ $USE_HOST_RUSTC -eq 1 ] || run-if-enabled armv7-unknown-linux-gnueabihf "rustup target add armv7-unknown-linux-gnueabihf"
5151
RUN [ $USE_HOST_RUSTC -eq 1 ] || run-if-enabled mips64-unknown-linux-gnuabi64 "rustup target add mips64-unknown-linux-gnuabi64"
5252

53+
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
54+
RUN bash -c '. /home/user/.nvm/nvm.sh; nvm install 17.7.1'
55+
RUN bash -c '. /home/user/.nvm/nvm.sh; npm install --global yarn'
56+
ENV PATH=$PATH:/home/user/.nvm/versions/node/v17.7.1/bin
57+
5358
ARG CARGO_TARGET_DIR=/home/user/cwd/target-docker
5459
ENV CARGO_TARGET_DIR=$CARGO_TARGET_DIR

0 commit comments

Comments
 (0)