Home Explore Help
Sign In
Operations
/
joystream
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

update setup and docker image to use rust 1.47.0, and nightly-2020-10-06 for WASM

Mokhtar Naamani 4 years ago
parent
727413852f
commit
91d4108ec4
2 changed files with 5 additions and 5 deletions
Unified View Show Diff Stats
  1. 3 3
      joystream-node.Dockerfile
  2. 2 2
      setup.sh

+ 3 - 3
joystream-node.Dockerfile
View File 

@@ -1,7 +1,7 @@
 
-FROM liuchong/rustup:1.46.0 AS rustup
 
+FROM liuchong/rustup:1.47.0 AS rustup
 
 RUN rustup component add rustfmt clippy
 
 RUN rustup component add rustfmt clippy
 
-RUN rustup install nightly-2020-05-23 --force
 
-RUN rustup target add wasm32-unknown-unknown --toolchain nightly-2020-05-23
 
+RUN rustup install nightly-2020-10-06 --force
 
+RUN rustup target add wasm32-unknown-unknown --toolchain nightly-2020-10-06
 
 RUN apt-get update && \
 
 RUN apt-get update && \
 
   apt-get install -y curl git gcc xz-utils sudo pkg-config unzip clang libc6-dev-i386
 
   apt-get install -y curl git gcc xz-utils sudo pkg-config unzip clang libc6-dev-i386

+ 2 - 2
setup.sh
View File 

@@ -17,8 +17,8 @@ rustup install nightly-2020-10-06 --force
 
 rustup target add wasm32-unknown-unknown --toolchain nightly-2020-10-06
 
 rustup target add wasm32-unknown-unknown --toolchain nightly-2020-10-06
 
 
 
 # Sticking with older version of compiler to ensure working build
 
 # Sticking with older version of compiler to ensure working build
 
-rustup install 1.46.0
 
-rustup default 1.46.0
 
+rustup install 1.47.0
 
+rustup default 1.47.0
 
 
 
 if [[ "$OSTYPE" == "linux-gnu" ]]; then
 
 if [[ "$OSTYPE" == "linux-gnu" ]]; then
 
     apt-get install -y coreutils clang jq curl gcc xz-utils sudo pkg-config unzip clang libc6-dev-i386
 
     apt-get install -y coreutils clang jq curl gcc xz-utils sudo pkg-config unzip clang libc6-dev-i386