Skip to content

Commit 2483059

Browse files
committed
update tools
1 parent ee84176 commit 2483059

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

Dockerfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ubuntu:21.04
33
RUN apt-get update -qq \
44
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
55
tini build-essential git \
6-
ccache cmake ninja-build llvm clang clang-format clang-tidy curl python python3 \
6+
ccache cmake ninja-build llvm clang clang-format clang-tidy curl python3 \
77
bison flex \
88
brotli rsync \
99
libpthread-stubs0-dev \
@@ -18,7 +18,7 @@ RUN apt-get update -qq \
1818
&& apt-get clean \
1919
&& rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/google.list
2020

21-
ARG EMSDK_VERSION="3.1.1"
21+
ARG EMSDK_VERSION="3.1.9"
2222
RUN mkdir -p /opt/emsdk \
2323
&& cd /opt/emsdk \
2424
&& curl -SL https://github.com/emscripten-core/emsdk/archive/${EMSDK_VERSION}.tar.gz | tar -xz --strip-components=1 \
@@ -37,8 +37,8 @@ RUN mkdir -p /opt/emsdk \
3737
SHELL ["/bin/bash", "-c"]
3838

3939
ENV NVM_DIR=/opt/nvm
40-
ARG NVM_VERSION="v0.39.0"
41-
ARG NODE_VERSION="v16.8.0"
40+
ARG NVM_VERSION="v0.39.1"
41+
ARG NODE_VERSION="v17.6.0"
4242
RUN mkdir -p /opt/nvm \
4343
&& ls -lisah /opt/nvm \
4444
&& curl https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh | bash \
@@ -48,7 +48,7 @@ RUN mkdir -p /opt/nvm \
4848
&& nvm use default \
4949
&& npm install --global yarn
5050

51-
ARG RUST_VERSION="1.55.0"
51+
ARG RUST_VERSION="1.60.0"
5252
RUN export RUSTUP_HOME=/opt/rust \
5353
&& export CARGO_HOME=/opt/rust \
5454
&& curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain ${RUST_VERSION} -y \
@@ -63,6 +63,7 @@ RUN source /opt/emsdk/emsdk_env.sh \
6363
&& echo "export EMSDK=$EMSDK" >> /opt/env.sh \
6464
&& echo "export EM_CONFIG=$EM_CONFIG" >> /opt/env.sh \
6565
&& echo "export EMSCRIPTEN=$EMSCRIPTEN" >> /opt/env.sh \
66+
&& echo "export CARGO_HOME=/opt/rust" >> /opt/env.sh \
6667
&& echo "export RUSTUP_HOME=/opt/rust" >> /opt/env.sh \
6768
&& echo "export BOOST_ARCHIVE=/opt/boost.tar.gz" >> /opt/env.sh \
6869
&& echo "export PATH=$PATH:/opt/rust/bin" >> /opt/env.sh \
@@ -71,4 +72,4 @@ RUN source /opt/emsdk/emsdk_env.sh \
7172
&& chmod +x /opt/entrypoint.sh
7273

7374
ENTRYPOINT ["tini", "-v", "--", "/opt/entrypoint.sh"]
74-
WORKDIR /github/workspace
75+
WORKDIR /wd

TAG

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.73
1+
0.74

0 commit comments

Comments
 (0)