git.delta.rocks / unique-network / refs/commits / 23f963dcddfc

difftreelog

deleted builds for polkadot & chainql instead copy from ready image

Konstantin Astakhov2022-10-21parent: #7025e37.patch.diff
in: master

5 files changed

modified.docker/Dockerfile-parachaindiffbeforeafterboth
--- a/.docker/Dockerfile-parachain
+++ b/.docker/Dockerfile-parachain
@@ -42,23 +42,13 @@
 RUN git clone $REPO_URL -b $BRANCH . && \
     cargo build --features=$FEATURE --$PROFILE
 
-# ===== BUILD POLKADOT =====
-FROM rust-builder as builder-polkadot
-
-ARG POLKADOT_BUILD_BRANCH=
-ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
-
-
-WORKDIR /unique_parachain
-
-RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \
-    cd polkadot && \
-    cargo build --release
-
 # ===== RUN ======
 
 FROM ubuntu:20.04
 
+ARG POLKADOT_BUILD_BRANCH=
+ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_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 && \
@@ -76,12 +66,13 @@
     yarn install
 
 COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/
-COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
-
 COPY --from=builder-unique /unique_parachain/launch-config.json /polkadot-launch/launch-config.json
 
+COPY --from=uniquenetwork/builder-polkadot:$POLKADOT_BUILD_BRANCH /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
 
 CMD export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
     cd /polkadot-launch && \
     yarn start launch-config.json
+
+
modified.docker/Dockerfile-parachain-node-onlydiffbeforeafterboth
--- a/.docker/Dockerfile-parachain-node-only
+++ b/.docker/Dockerfile-parachain-node-only
@@ -52,25 +52,14 @@
 
 RUN cargo build --features=$FEATURE --$PROFILE
 
-# ===== BUILD POLKADOT =====
-FROM rust-builder as builder-polkadot
-
-ARG POLKADOT_BUILD_BRANCH=
-ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
-
-
-WORKDIR /unique_parachain
-
-RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \
-    cd polkadot && \
-    cargo build --release
-
 # ===== RUN ======
 
 FROM ubuntu:20.04
 
 ARG RUNTIME=
 ENV RUNTIME $RUNTIME
+ARG POLKADOT_BUILD_BRANCH=
+ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
 
 RUN apt-get -y update && \
     apt-get -y install curl git && \
@@ -89,15 +78,16 @@
     yarn install
 
 RUN echo "$RUNTIME"
+RUN echo "$POLKADOT_BUILD_BRANCH"
 
 COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/
 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=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
-COPY --from=builder-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
+COPY --from=uniquenetwork/builder-polkadot:$POLKADOT_BUILD_BRANCH /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
 
 CMD export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
     cd /polkadot-launch && \
     yarn start launch-config.json --test-upgrade-parachains -w -n
+
+
modified.docker/Dockerfile-parachain-upgradediffbeforeafterboth
before · .docker/Dockerfile-parachain-upgrade
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_parachain2930# ===== BUILD current version ======31FROM rust-builder as builder-unique-current3233ARG PROFILE=release34ARG FEATURE=35ARG MAINNET_BRANCH=36ARG REPO_URL=3738WORKDIR /unique_parachain3940RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \41    cargo build --features=$FEATURE --$PROFILE4243# ===== BUILD target version ======44FROM rust-builder as builder-unique-target4546ARG PROFILE=release47ARG FEATURE=48ARG BRANCH=49ARG REPO_URL=5051COPY . /unique_parachain52WORKDIR /unique_parachain5354RUN cargo build --features=$FEATURE --$PROFILE5556# ===== BUILD POLKADOT =====57FROM rust-builder as builder-polkadot5859ARG POLKADOT_BUILD_BRANCH=60ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH616263WORKDIR /unique_parachain6465RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \66    cd polkadot && \67    cargo build --release6869# ===== RUN ======7071FROM ubuntu:20.047273ARG RUNTIME=74ENV RUNTIME $RUNTIME7576RUN apt-get -y update && \77    apt-get -y install curl git && \78    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \79    export NVM_DIR="$HOME/.nvm" && \80    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \81    nvm install v16.16.0 && \82    nvm use v16.16.08384RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing8586RUN export NVM_DIR="$HOME/.nvm" && \87    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \88    cd /polkadot-launch && \89    npm install --global yarn && \90    yarn install9192RUN echo "$RUNTIME"9394COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/95COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/96COPY --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.wasm9798COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/99COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm100101CMD export NVM_DIR="$HOME/.nvm" && \102    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \103    cd /polkadot-launch && \104    yarn start launch-config.json --test-upgrade-parachains
after · .docker/Dockerfile-parachain-upgrade
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_parachain2930# ===== BUILD current version ======31FROM rust-builder as builder-unique-current3233ARG PROFILE=release34ARG FEATURE=35ARG MAINNET_BRANCH=36ARG REPO_URL=3738WORKDIR /unique_parachain3940RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \41    cargo build --features=$FEATURE --$PROFILE4243# ===== BUILD target version ======44FROM rust-builder as builder-unique-target4546ARG PROFILE=release47ARG FEATURE=48ARG BRANCH=49ARG REPO_URL=5051COPY . /unique_parachain52WORKDIR /unique_parachain5354RUN cargo build --features=$FEATURE --$PROFILE5556# ===== RUN ======5758FROM ubuntu:20.045960ARG RUNTIME=61ENV RUNTIME $RUNTIME62ARG POLKADOT_BUILD_BRANCH=63ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH6465RUN apt-get -y update && \66    apt-get -y install curl git && \67    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \68    export NVM_DIR="$HOME/.nvm" && \69    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \70    nvm install v16.16.0 && \71    nvm use v16.16.07273RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing7475RUN export NVM_DIR="$HOME/.nvm" && \76    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \77    cd /polkadot-launch && \78    npm install --global yarn && \79    yarn install8081RUN echo "$RUNTIME"82RUN echo "$POLKADOT_BUILD_BRANCH"8384COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/85COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/8687COPY --from=uniquenetwork/builder-polkadot:$POLKADOT_BUILD_BRANCH /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/8889CMD export NVM_DIR="$HOME/.nvm" && \90    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \91    cd /polkadot-launch && \92    yarn start launch-config.json --test-upgrade-parachains
modified.docker/Dockerfile-parachain-upgrade-datadiffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade-data
+++ b/.docker/Dockerfile-parachain-upgrade-data
@@ -53,33 +53,16 @@
 
 RUN cargo build --features=$FEATURE --$PROFILE
 
-# ===== BUILD POLKADOT =====
-FROM rust-builder as builder-polkadot
-
-ARG POLKADOT_BUILD_BRANCH=
-ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
-
-WORKDIR /unique_parachain
-
-RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \
-    cd polkadot && \
-    cargo build --release
-
-# ===== BUILD CHAINQL =====
-FROM rust-builder as builder-chainql
-
-RUN mkdir chainql
-WORKDIR /chainql
-
-RUN git clone -b v0.2.0 --depth 1 https://github.com/CertainLach/chainql.git . && \
-    cargo build --release
-
 # ===== RUN ======
 
 FROM ubuntu:20.04
 
 ARG RUNTIME=
 ENV RUNTIME $RUNTIME
+ARG REPLICA_FROM=
+ENV REPLICA_FROM=$REPLICA_FROM
+ARG POLKADOT_BUILD_BRANCH=
+ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
 
 RUN apt-get -y update && \
     apt-get -y install curl git && \
@@ -98,18 +81,16 @@
     yarn install
 
 RUN echo "$RUNTIME"
+RUN echo "$REPLICA_FROM"
+RUN echo "$POLKADOT_BUILD_BRANCH"
 
 COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/
 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=builder-chainql /chainql/target/release/chainql /chainql/target/release/
+COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/
 
-COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
-COPY --from=builder-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
+COPY --from=uniquenetwork/builder-polkadot:$POLKADOT_BUILD_BRANCH /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
 
-ARG REPLICA_FROM=
-ENV REPLICA_FROM=$REPLICA_FROM
 CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" REPLICA_FROM && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
     cd /polkadot-launch && \
modified.docker/Dockerfile-polkadot.j2diffbeforeafterboth
--- a/.docker/Dockerfile-polkadot.j2
+++ b/.docker/Dockerfile-polkadot.j2
@@ -8,7 +8,7 @@
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN apt-get update && \
-    apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev && \
+    apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev protobuf-compiler && \
     apt-get clean && \
     rm -r /var/lib/apt/lists/*