From 4f6acde82186873873c95f33270236b36a6dff2e Mon Sep 17 00:00:00 2001 From: Fabian Date: Wed, 7 Jul 2021 18:31:40 -0500 Subject: [PATCH] update test image dockerfile --- tools/docker/test-image/Dockerfile | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/tools/docker/test-image/Dockerfile b/tools/docker/test-image/Dockerfile index cc80362c..d3ec5b68 100644 --- a/tools/docker/test-image/Dockerfile +++ b/tools/docker/test-image/Dockerfile @@ -1,24 +1,12 @@ -FROM ubuntu:20.04 +FROM ubuntu:21.04 RUN \ export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture i386 && \ apt-get update -qq && \ - apt-get dist-upgrade -y -RUN \ - export DEBIAN_FRONTEND=noninteractive && \ - apt-get install -y nasm gdb unzip p7zip-full openjdk-8-jre wget python python3 qemu-system-x86 git-core build-essential libc6-dev-i386-cross libc6-dev-i386 clang curl -RUN \ - NODEVSN=v14.16.0 && \ - wget https://nodejs.org/dist/$NODEVSN/node-$NODEVSN-linux-x64.tar.xz && \ - tar xfv node-$NODEVSN-linux-x64.tar.xz && \ - rm node-$NODEVSN-linux-x64.tar.xz && \ - echo 'export PATH="$PATH:/node-$NODEVSN-linux-x64/bin"' >> ~/.bashrc && \ - wget https://sh.rustup.rs -O rustup.sh && \ - sh ./rustup.sh -y && \ - rm ./rustup.sh && \ + apt-get install -y nodejs nasm gdb unzip p7zip-full openjdk-8-jre wget python python3 qemu-system-x86 git-core build-essential libc6-dev-i386-cross libc6-dev-i386 clang curl time && \ + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \ export PATH="$HOME/.cargo/bin:$PATH" && \ - rustup toolchain install nightly && \ - rustup default nightly && \ - rustup target add wasm32-unknown-unknown --toolchain nightly && \ - rustup component add rustfmt-preview --toolchain nightly + rustup toolchain install stable && \ + rustup target add wasm32-unknown-unknown && \ + rustup component add rustfmt-preview