git.delta.rocks / unique-network / refs/commits / f9465867a0f0

difftreelog

final cleanup

Alexander Aksenov2022-08-04parent: #a0c3d00.patch.diff
in: master

2 files changed

deleted.docker/.envdiffbeforeafterboth
--- a/.docker/.env
+++ /dev/null
@@ -1,7 +0,0 @@
-RUST_TOOLCHAIN=nightly-2022-05-11
-RUST_C=1.62.0-nightly
-POLKA_VERSION=release-v0.9.24
-UNIQUE_BRANCH=develop
-FEATURE='--features=quartz-runtime'
-USER=***
-PASS=***
modified.docker/Dockerfile-parachaindiffbeforeafterboth
before · .docker/Dockerfile-parachain
1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=nightly-2022-05-1167ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN8ENV CARGO_HOME="/cargo-home"9ENV PATH="/cargo-home/bin:$PATH"1011RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1213RUN apt-get update && \14    apt-get install -y cmake pkg-config libssl-dev git clang && \15    apt-get clean && \16    rm -r /var/lib/apt/lists/*1718RUN rustup toolchain uninstall $(rustup toolchain list) && \19    rustup toolchain install $RUST_TOOLCHAIN && \20    rustup default $RUST_TOOLCHAIN && \21    rustup target list --installed && \22    rustup show23RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN2425RUN pwd && ls -la2627RUN mkdir unique_parachain28WORKDIR /unique_parachain2930# ===== BUILD ======31FROM rust-builder as builder-unique3233ARG PROFILE=release3435RUN mkdir unique_parachain36WORKDIR /unique_parachain3738RUN pwd && ls -la39COPY . .40RUN cargo build --$PROFILE41   # && \42   # cargo test4344# ===== BUILD POLKADOT =====45FROM rust-builder as builder-polkadot4647ARG POLKA_VERSION=release-v0.9.2448ENV POLKA_VERSION $POLKA_VERSION4950RUN mkdir unique_parachain51WORKDIR /unique_parachain5253RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \54    cd polkadot && \55    cargo build --release5657# ===== RUN ======5859FROM ubuntu:20.046061RUN apt-get -y update && \62      apt-get -y upgrade && \63      apt-get -y install curl git && \64      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \65      export NVM_DIR="$HOME/.nvm" && \66      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \67      nvm install v16.16.0 && \68      nvm use v16.16.06970RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing7172RUN export NVM_DIR="$HOME/.nvm" && \73    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \74    cd /polkadot-launch && \75    npm install --global yarn && \76    yarn install7778COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/79COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/8081COPY ["./launch-config.json", "/polkadot-launch/launch-config.json"]828384CMD export NVM_DIR="$HOME/.nvm" && \85    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \86    cd /polkadot-launch && \87    yarn start launch-config.json
after · .docker/Dockerfile-parachain
1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=nightly-2022-05-1167ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN8ENV CARGO_HOME="/cargo-home"9ENV PATH="/cargo-home/bin:$PATH"1011RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1213RUN apt-get update && \14    apt-get install -y cmake pkg-config libssl-dev git clang && \15    apt-get clean && \16    rm -r /var/lib/apt/lists/*1718RUN rustup toolchain uninstall $(rustup toolchain list) && \19    rustup toolchain install $RUST_TOOLCHAIN && \20    rustup default $RUST_TOOLCHAIN && \21    rustup target list --installed && \22    rustup show23RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN242526RUN mkdir unique_parachain27WORKDIR /unique_parachain2829# ===== BUILD ======30FROM rust-builder as builder-unique3132ARG PROFILE=release33ARG FEATURE=3435RUN mkdir unique_parachain36WORKDIR /unique_parachain3738RUN git clone $REPO_URL -b $BRANCH39RUN cargo build $FEATURE --$PROFILE40   # && \41   # cargo test4243# ===== BUILD POLKADOT =====44FROM rust-builder as builder-polkadot4546ARG POLKA_VERSION=release-v0.9.2447ENV POLKA_VERSION $POLKA_VERSION4849RUN mkdir unique_parachain50WORKDIR /unique_parachain5152RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \53    cd polkadot && \54    cargo build --release5556# ===== RUN ======5758FROM ubuntu:20.045960RUN apt-get -y update && \61      apt-get -y upgrade && \62      apt-get -y install curl git && \63      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \64      export NVM_DIR="$HOME/.nvm" && \65      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \66      nvm install v16.16.0 && \67      nvm use v16.16.06869RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing7071RUN export NVM_DIR="$HOME/.nvm" && \72    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \73    cd /polkadot-launch && \74    npm install --global yarn && \75    yarn install7677COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/78COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/7980COPY ["./launch-config.json", "/polkadot-launch/launch-config.json"]818283CMD export NVM_DIR="$HOME/.nvm" && \84    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \85    cd /polkadot-launch && \86    yarn start launch-config.json