diff --git a/dockerfiles/ci-linux/Dockerfile b/dockerfiles/ci-linux/Dockerfile index 79178543..285d2249 100644 --- a/dockerfiles/ci-linux/Dockerfile +++ b/dockerfiles/ci-linux/Dockerfile @@ -10,43 +10,43 @@ LABEL summary="Image for Substrate-based projects." \ maintainer="devops-team@parity.io" \ version="1.0" \ description="Inherits from base-ci-linux; \ -wasm-gc, wasm-bindgen-cli, wasm-pack, cargo-audit, cargo-web, cargo-deny" \ + wasm-gc, wasm-bindgen-cli, wasm-pack, cargo-audit, cargo-web, cargo-deny" \ io.parity.image.vendor="Parity Technologies" \ io.parity.image.source="https://github.com/paritytech/scripts/blob/${VCS_REF}/\ -dockerfiles/ci-linux/Dockerfile" \ + dockerfiles/ci-linux/Dockerfile" \ io.parity.image.documentation="https://github.com/paritytech/scripts/blob/${VCS_REF}/\ -dockerfiles/ci-linux/README.md" \ + dockerfiles/ci-linux/README.md" \ io.parity.image.revision="${VCS_REF}" \ io.parity.image.created="${BUILD_DATE}" # install tools and dependencies RUN set -eux && \ -# install `rust-src` component for ui test + # install `rust-src` component for ui test rustup component add rust-src rustfmt clippy && \ -# install specific Rust nightly, default is stable, use minimum components - rustup toolchain install nightly-2021-11-08 --profile minimal --component rustfmt clippy && \ -# "alias" pinned nightly-2021-11-08 toolchain as nightly - ln -s /usr/local/rustup/toolchains/nightly-2021-11-08-x86_64-unknown-linux-gnu /usr/local/rustup/toolchains/nightly-x86_64-unknown-linux-gnu && \ -# install wasm toolchain + # install specific Rust nightly, default is stable, use minimum components + rustup toolchain install nightly-2022-04-08 --profile minimal --component rustfmt clippy && \ + # "alias" pinned nightly-2022-04-08 toolchain as nightly + ln -s /usr/local/rustup/toolchains/nightly-2022-04-08-x86_64-unknown-linux-gnu /usr/local/rustup/toolchains/nightly-x86_64-unknown-linux-gnu && \ + # install wasm toolchain rustup target add wasm32-unknown-unknown && \ rustup target add wasm32-unknown-unknown --toolchain nightly && \ -# install cargo tools + # install cargo tools cargo install cargo-web wasm-pack cargo-deny cargo-spellcheck && \ cargo install --version 0.4.2 diener && \ -# wasm-bindgen-cli version should match the one pinned in substrate -# https://github.com/paritytech/substrate/blob/master/bin/node/browser-testing/Cargo.toml#L15 + # wasm-bindgen-cli version should match the one pinned in substrate + # https://github.com/paritytech/substrate/blob/master/bin/node/browser-testing/Cargo.toml#L15 cargo install --version 0.2.73 wasm-bindgen-cli && \ -# install wasm-gc. It's useful for stripping slimming down wasm binaries (polkadot) + # install wasm-gc. It's useful for stripping slimming down wasm binaries (polkadot) cargo +nightly install wasm-gc && \ -# versions + # versions rustup show && \ cargo --version && \ -# apt clean up + # apt clean up apt-get autoremove -y && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ -# cargo clean up -# removes compilation artifacts cargo install creates (>250M) + # cargo clean up + # removes compilation artifacts cargo install creates (>250M) rm -rf "${CARGO_HOME}/registry" "${CARGO_HOME}/git" /root/.cache/sccache # TODO: switch to non-root here when substrate will work with latest rust nightlies again