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

difftreelog

set ubuntu 22.04

Konstantin Astakhov2023-04-11parent: #71169bd.patch.diff
in: master

2 files changed

modified.docker/Dockerfile-parachain-upgrade-data.j2diffbeforeafterboth
before · .docker/Dockerfile-parachain-upgrade-data.j2
1ARG POLKADOT_BUILD_BRANCH2FROM uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} as polkadot34# ===== Rust builder =====5FROM uniquenetwork/services:latest as rust-builder67ENV CARGO_HOME="/cargo-home"8ENV PATH="/cargo-home/bin:$PATH"9ENV TZ=UTC1011RUN rustup toolchain uninstall $(rustup toolchain list) && \12    rustup toolchain install {{ RUST_TOOLCHAIN }} && \13    rustup default {{ RUST_TOOLCHAIN }} && \14    rustup target list --installed && \15    rustup show16RUN rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }}1718RUN mkdir /unique_parachain19WORKDIR /unique_parachain2021# ===== BUILD current version ======22FROM rust-builder as builder-unique-current2324ARG PROFILE=release2526WORKDIR /unique_parachain2728RUN git clone https://github.com/UniqueNetwork/unique-chain.git -b {{ MAINNET_BRANCH }} . && \29    cargo build --features={{ NETWORK }}-runtime --$PROFILE3031# ===== BUILD target version ======32FROM rust-builder as builder-unique-target3334ARG PROFILE=release3536COPY . /unique_parachain37WORKDIR /unique_parachain3839RUN cargo build --features={{ NETWORK }}-runtime --$PROFILE4041# ===== RUN ======42FROM ubuntu:20.044344ENV REPLICA_FROM={{ REPLICA_FROM }}4546RUN apt-get -y update && \47    apt-get -y install curl git && \48    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \49    export NVM_DIR="$HOME/.nvm" && \50    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \51    nvm install v16.16.0 && \52    nvm use v16.16.05354RUN git clone https://github.com/uniquenetwork/polkadot-launch.git -b {{ POLKADOT_LAUNCH_BRANCH }}5556RUN export NVM_DIR="$HOME/.nvm" && \57    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \58    cd /polkadot-launch && \59    npm install --global yarn && \60    yarn install6162COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/63COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/64COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm6566COPY --from=builder-unique-target /unique_parachain/.docker/forkless-config/launch-config-forkless-data.json /polkadot-launch/launch-config.json67COPY --from=builder-unique-target /unique_parachain/.docker/forkless-config/fork.jsonnet /polkadot-launch/fork.jsonnet68COPY --from=builder-unique-target /unique_parachain/.docker/forkless-config/typeNames.jsonnet /polkadot-launch/typeNames.jsonnet6970COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/7172COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/73COPY --from=polkadot /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm7475CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" REPLICA_FROM && \76    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \77    cd /polkadot-launch && \78    yarn start launch-config.json --test-upgrade-parachains
after · .docker/Dockerfile-parachain-upgrade-data.j2
1ARG POLKADOT_BUILD_BRANCH2FROM uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} as polkadot34# ===== Rust builder =====5FROM uniquenetwork/services:latest as rust-builder67ENV CARGO_HOME="/cargo-home"8ENV PATH="/cargo-home/bin:$PATH"9ENV TZ=UTC1011RUN rustup toolchain uninstall $(rustup toolchain list) && \12    rustup toolchain install {{ RUST_TOOLCHAIN }} && \13    rustup default {{ RUST_TOOLCHAIN }} && \14    rustup target list --installed && \15    rustup show16RUN rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }}1718RUN mkdir /unique_parachain19WORKDIR /unique_parachain2021# ===== BUILD current version ======22FROM rust-builder as builder-unique-current2324ARG PROFILE=release2526WORKDIR /unique_parachain2728RUN git clone https://github.com/UniqueNetwork/unique-chain.git -b {{ MAINNET_BRANCH }} . && \29    cargo build --features={{ NETWORK }}-runtime --$PROFILE3031# ===== BUILD target version ======32FROM rust-builder as builder-unique-target3334ARG PROFILE=release3536COPY . /unique_parachain37WORKDIR /unique_parachain3839RUN cargo build --features={{ NETWORK }}-runtime --$PROFILE4041# ===== RUN ======42FROM ubuntu:22.044344ENV REPLICA_FROM={{ REPLICA_FROM }}4546RUN apt-get -y update && \47    apt-get -y install curl git && \48    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \49    export NVM_DIR="$HOME/.nvm" && \50    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \51    nvm install v16.16.0 && \52    nvm use v16.16.05354RUN git clone https://github.com/uniquenetwork/polkadot-launch.git -b {{ POLKADOT_LAUNCH_BRANCH }}5556RUN export NVM_DIR="$HOME/.nvm" && \57    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \58    cd /polkadot-launch && \59    npm install --global yarn && \60    yarn install6162COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/63COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/64COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm6566COPY --from=builder-unique-target /unique_parachain/.docker/forkless-config/launch-config-forkless-data.json /polkadot-launch/launch-config.json67COPY --from=builder-unique-target /unique_parachain/.docker/forkless-config/fork.jsonnet /polkadot-launch/fork.jsonnet68COPY --from=builder-unique-target /unique_parachain/.docker/forkless-config/typeNames.jsonnet /polkadot-launch/typeNames.jsonnet6970COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/7172COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/73COPY --from=polkadot /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm7475CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" REPLICA_FROM && \76    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \77    cd /polkadot-launch && \78    yarn start launch-config.json --test-upgrade-parachains
modified.docker/Dockerfile-parachain-upgrade.j2diffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade.j2
+++ b/.docker/Dockerfile-parachain-upgrade.j2
@@ -39,7 +39,7 @@
 RUN cargo build --features={{ NETWORK }}-runtime --$PROFILE
 
 # ===== RUN ======
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get -y update && \
     apt-get -y install curl git && \