From 474086629f2e7dd21288cffa0a9c4de72e8ebb07 Mon Sep 17 00:00:00 2001 From: Konstantin Astakhov Date: Thu, 30 May 2024 09:57:00 +0000 Subject: [PATCH] add rust-src for rust builder image --- --- a/.docker/Dockerfile-acala.j2 +++ b/.docker/Dockerfile-acala.j2 @@ -17,6 +17,7 @@ RUN rustup toolchain install {{ RUST_TOOLCHAIN }} && \ rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }} && \ rustup default {{ RUST_TOOLCHAIN }} && \ + rustup component add --toolchain {{ RUST_TOOLCHAIN }} rust-src && \ rustup target list --installed && \ rustup show --- a/.docker/Dockerfile-astar.j2 +++ b/.docker/Dockerfile-astar.j2 @@ -17,6 +17,7 @@ RUN rustup toolchain install {{ RUST_TOOLCHAIN }} && \ rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }} && \ rustup default {{ RUST_TOOLCHAIN }} && \ + rustup component add --toolchain {{ RUST_TOOLCHAIN }} rust-src && \ rustup target list --installed && \ rustup show --- a/.docker/Dockerfile-chain-dev +++ b/.docker/Dockerfile-chain-dev @@ -14,6 +14,7 @@ RUN rustup toolchain uninstall $(rustup toolchain list) && \ rustup toolchain install $RUST_TOOLCHAIN && \ rustup default $RUST_TOOLCHAIN && \ + rustup component add --toolchain $RUST_TOOLCHAIN rust-src && \ rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN RUN mkdir /dev_chain --- a/.docker/Dockerfile-chain-dev-unit +++ b/.docker/Dockerfile-chain-dev-unit @@ -10,6 +10,7 @@ RUN rustup toolchain uninstall $(rustup toolchain list) && \ rustup toolchain install $RUST_TOOLCHAIN && \ rustup default $RUST_TOOLCHAIN && \ + rustup component add --toolchain $RUST_TOOLCHAIN rust-src && \ rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN RUN mkdir /dev_chain --- a/.docker/Dockerfile-collators.j2 +++ b/.docker/Dockerfile-collators.j2 @@ -9,6 +9,7 @@ RUN rustup toolchain uninstall $(rustup toolchain list) && \ rustup toolchain install {{ RUST_TOOLCHAIN }} && \ rustup default {{ RUST_TOOLCHAIN }} && \ + rustup component add --toolchain {{ RUST_TOOLCHAIN }} rust-src && \ rustup target list --installed && \ rustup show RUN rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }} --- a/.docker/Dockerfile-cumulus.j2 +++ b/.docker/Dockerfile-cumulus.j2 @@ -17,6 +17,7 @@ RUN rustup toolchain install {{ RUST_TOOLCHAIN }} && \ rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }} && \ rustup default {{ RUST_TOOLCHAIN }} && \ + rustup component add --toolchain {{ RUST_TOOLCHAIN }} rust-src && \ rustup target list --installed && \ rustup show --- a/.docker/Dockerfile-hydradx.j2 +++ b/.docker/Dockerfile-hydradx.j2 @@ -17,6 +17,7 @@ RUN rustup toolchain install {{ RUST_TOOLCHAIN }} && \ rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }} && \ rustup default {{ RUST_TOOLCHAIN }} && \ + rustup component add --toolchain {{ RUST_TOOLCHAIN }} rust-src && \ rustup target list --installed && \ rustup show --- a/.docker/Dockerfile-moonbeam.j2 +++ b/.docker/Dockerfile-moonbeam.j2 @@ -17,6 +17,7 @@ RUN rustup toolchain install {{ RUST_TOOLCHAIN }} && \ rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }} && \ rustup default {{ RUST_TOOLCHAIN }} && \ + rustup component add --toolchain {{ RUST_TOOLCHAIN }} rust-src && \ rustup target list --installed && \ rustup show --- a/.docker/Dockerfile-parachain +++ b/.docker/Dockerfile-parachain @@ -12,6 +12,7 @@ RUN rustup toolchain uninstall $(rustup toolchain list) && \ rustup toolchain install $RUST_TOOLCHAIN && \ rustup default $RUST_TOOLCHAIN && \ + rustup component add --toolchain $RUST_TOOLCHAIN rust-src && \ rustup target list --installed && \ rustup show RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN @@ -42,12 +43,12 @@ ARG POLKADOT_LAUNCH_BRANCH= RUN apt-get -y update && \ - apt-get -y install curl git && \ - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \ - export NVM_DIR="$HOME/.nvm" && \ - [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \ - nvm install v16.16.0 && \ - nvm use v16.16.0 + apt-get -y install curl git && \ + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \ + export NVM_DIR="$HOME/.nvm" && \ + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \ + nvm install v16.16.0 && \ + nvm use v16.16.0 RUN git clone https://github.com/uniquenetwork/polkadot-launch -b ${POLKADOT_LAUNCH_BRANCH} --- a/.docker/Dockerfile-parachain-upgrade-data.j2 +++ b/.docker/Dockerfile-parachain-upgrade-data.j2 @@ -10,6 +10,7 @@ RUN rustup toolchain uninstall $(rustup toolchain list) && \ rustup toolchain install {{ RUST_TOOLCHAIN }} && \ rustup default {{ RUST_TOOLCHAIN }} && \ + rustup component add --toolchain {{ RUST_TOOLCHAIN }} rust-src && \ rustup target list --installed && \ rustup show RUN rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }} --- a/.docker/Dockerfile-parachain-upgrade.j2 +++ b/.docker/Dockerfile-parachain-upgrade.j2 @@ -10,6 +10,7 @@ RUN rustup toolchain uninstall $(rustup toolchain list) && \ rustup toolchain install {{ RUST_TOOLCHAIN }} && \ rustup default {{ RUST_TOOLCHAIN }} && \ + rustup component add --toolchain {{ RUST_TOOLCHAIN }} rust-src && \ rustup target list --installed && \ rustup show RUN rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }} --- a/.docker/Dockerfile-polkadex.j2 +++ b/.docker/Dockerfile-polkadex.j2 @@ -17,6 +17,7 @@ RUN rustup toolchain install {{ RUST_TOOLCHAIN }} && \ rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }} && \ rustup default {{ RUST_TOOLCHAIN }} && \ + rustup component add --toolchain {{ RUST_TOOLCHAIN }} rust-src && \ rustup target list --installed && \ rustup show --- a/.docker/Dockerfile-polkadot.j2 +++ b/.docker/Dockerfile-polkadot.j2 @@ -17,6 +17,7 @@ RUN rustup toolchain install {{ RUST_TOOLCHAIN }} && \ rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }} && \ rustup default {{ RUST_TOOLCHAIN }} && \ + rustup component add --toolchain {{ RUST_TOOLCHAIN }} rust-src && \ rustup target list --installed && \ rustup show --- a/.docker/Dockerfile-testnet.j2 +++ b/.docker/Dockerfile-testnet.j2 @@ -10,6 +10,7 @@ RUN rustup toolchain uninstall $(rustup toolchain list) && \ rustup toolchain install {{ RUST_TOOLCHAIN }} && \ rustup default {{ RUST_TOOLCHAIN }} && \ + rustup component add --toolchain {{ RUST_TOOLCHAIN }} rust-src && \ rustup target list --installed && \ rustup show RUN rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }} --- a/.docker/Dockerfile-try-runtime.j2 +++ b/.docker/Dockerfile-try-runtime.j2 @@ -10,6 +10,7 @@ rustup toolchain install {{ RUST_TOOLCHAIN }} && \ rustup default {{ RUST_TOOLCHAIN }} && \ rustup target list --installed && \ + rustup component add --toolchain {{ RUST_TOOLCHAIN }} rust-src && \ rustup show RUN rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }} --- a/.docker/Dockerfile-unique +++ b/.docker/Dockerfile-unique @@ -19,6 +19,7 @@ rustup toolchain install $RUST_TOOLCHAIN && \ rustup target add wasm32-unknown-unknown --toolchain ${RUST_TOOLCHAIN} && \ rustup default $RUST_TOOLCHAIN && \ + rustup component add --toolchain $RUST_TOOLCHAIN rust-src && \ rustup target list --installed && \ rustup show --- a/.docker/Dockerfile-unique-release +++ b/.docker/Dockerfile-unique-release @@ -19,6 +19,7 @@ rustup toolchain install $RUST_TOOLCHAIN && \ rustup target add wasm32-unknown-unknown --toolchain ${RUST_TOOLCHAIN} && \ rustup default $RUST_TOOLCHAIN && \ + rustup component add --toolchain $RUST_TOOLCHAIN rust-src && \ rustup target list --installed && \ rustup show -- gitstuff