git.delta.rocks / unique-network / refs/commits / 5487ee73ea6a

difftreelog

fix copy from build tag for polkadot

Konstantin Astakhov2022-10-24parent: #4778ac7.patch.diff
in: master

4 files changed

modified.docker/Dockerfile-parachaindiffbeforeafterboth
before · .docker/Dockerfile-parachain
1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=67ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN8ENV CARGO_HOME="/cargo-home"9ENV PATH="/cargo-home/bin:$PATH"10ENV TZ=UTC11RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1213RUN apt-get update && \14    apt-get install -y curl cmake pkg-config libssl-dev git clang protobuf-compiler && \15    apt-get clean && \16    rm -r /var/lib/apt/lists/*1718RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1920RUN rustup toolchain uninstall $(rustup toolchain list) && \21    rustup toolchain install $RUST_TOOLCHAIN && \22    rustup default $RUST_TOOLCHAIN && \23    rustup target list --installed && \24    rustup show25RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN2627RUN mkdir /unique_parachain28WORKDIR /unique_parachain293031# ===== BUILD ======32FROM rust-builder as builder-unique3334ARG PROFILE=release35ARG FEATURE=36ARG REPO_URL=37ARG BRANCH=383940WORKDIR /unique_parachain4142RUN git clone $REPO_URL -b $BRANCH . && \43    cargo build --features=$FEATURE --$PROFILE4445# ===== RUN ======4647FROM ubuntu:20.044849ARG POLKADOT_BUILD_BRANCH=50ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH5152RUN apt-get -y update && \53      apt-get -y install curl git && \54      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \55      export NVM_DIR="$HOME/.nvm" && \56      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \57      nvm install v16.16.0 && \58      nvm use v16.16.05960RUN git clone https://github.com/uniquenetwork/polkadot-launch -b unique-network6162RUN export NVM_DIR="$HOME/.nvm" && \63    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \64    cd /polkadot-launch && \65    npm install --global yarn && \66    yarn install6768COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/69COPY --from=builder-unique /unique_parachain/launch-config.json /polkadot-launch/launch-config.json7071COPY --from=uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/7273CMD export NVM_DIR="$HOME/.nvm" && \74    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \75    cd /polkadot-launch && \76    yarn start launch-config.json7778
after · .docker/Dockerfile-parachain
1ARG POLKADOT_BUILD_BRANCH2FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot34# ===== Rust builder =====5FROM ubuntu:20.04 as rust-builder6LABEL maintainer="Unique.Network"78ARG RUST_TOOLCHAIN=910ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN11ENV CARGO_HOME="/cargo-home"12ENV PATH="/cargo-home/bin:$PATH"13ENV TZ=UTC14RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1516RUN apt-get update && \17    apt-get install -y curl cmake pkg-config libssl-dev git clang protobuf-compiler && \18    apt-get clean && \19    rm -r /var/lib/apt/lists/*2021RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none2223RUN rustup toolchain uninstall $(rustup toolchain list) && \24    rustup toolchain install $RUST_TOOLCHAIN && \25    rustup default $RUST_TOOLCHAIN && \26    rustup target list --installed && \27    rustup show28RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN2930RUN mkdir /unique_parachain31WORKDIR /unique_parachain323334# ===== BUILD ======35FROM rust-builder as builder-unique3637ARG PROFILE=release38ARG FEATURE=39ARG REPO_URL=40ARG BRANCH=4142WORKDIR /unique_parachain4344RUN git clone $REPO_URL -b $BRANCH . && \45    cargo build --features=$FEATURE --$PROFILE4647# ===== RUN ======4849FROM ubuntu:20.045051ARG POLKADOT_BUILD_BRANCH=52ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH5354RUN apt-get -y update && \55      apt-get -y install curl git && \56      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \57      export NVM_DIR="$HOME/.nvm" && \58      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \59      nvm install v16.16.0 && \60      nvm use v16.16.06162RUN git clone https://github.com/uniquenetwork/polkadot-launch -b unique-network6364RUN export NVM_DIR="$HOME/.nvm" && \65    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \66    cd /polkadot-launch && \67    npm install --global yarn && \68    yarn install6970COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/71COPY --from=builder-unique /unique_parachain/launch-config.json /polkadot-launch/launch-config.json7273COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/7475CMD export NVM_DIR="$HOME/.nvm" && \76    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \77    cd /polkadot-launch && \78    yarn start launch-config.json79
modified.docker/Dockerfile-parachain-node-onlydiffbeforeafterboth
--- a/.docker/Dockerfile-parachain-node-only
+++ b/.docker/Dockerfile-parachain-node-only
@@ -1,3 +1,6 @@
+ARG POLKADOT_BUILD_BRANCH
+FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot
+
 # ===== Rust builder =====
 FROM ubuntu:20.04 as rust-builder
 LABEL maintainer="Unique.Network"
@@ -84,9 +87,8 @@
 COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/
 COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm
 
-COPY --from=uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
-COPY --from=uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm
-
+COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
+COPY --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.wasm
 
 CMD export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
modified.docker/Dockerfile-parachain-upgradediffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade
+++ b/.docker/Dockerfile-parachain-upgrade
@@ -1,3 +1,6 @@
+ARG POLKADOT_BUILD_BRANCH
+FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot
+
 # ===== Rust builder =====
 FROM ubuntu:20.04 as rust-builder
 LABEL maintainer="Unique.Network"
@@ -85,8 +88,8 @@
 COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/
 COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm
 
-COPY --from=uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
-COPY --from=uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm
+COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
+COPY --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.wasm
 
 CMD export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
modified.docker/Dockerfile-parachain-upgrade-datadiffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade-data
+++ b/.docker/Dockerfile-parachain-upgrade-data
@@ -1,3 +1,6 @@
+ARG POLKADOT_BUILD_BRANCH
+FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot
+
 # ===== Rust builder =====
 FROM ubuntu:20.04 as rust-builder
 LABEL maintainer="Unique.Network"
@@ -90,8 +93,8 @@
 
 COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/
 
-COPY --from=uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
-COPY --from=uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm
+COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
+COPY --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.wasm
 
 CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" REPLICA_FROM && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \