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
42RUN git clone $REPO_URL -b $BRANCH . && \42RUN git clone $REPO_URL -b $BRANCH . && \
43    cargo build --features=$FEATURE --$PROFILE43    cargo build --features=$FEATURE --$PROFILE
4444
45# ===== BUILD POLKADOT =====
46FROM rust-builder as builder-polkadot
47
48ARG POLKADOT_BUILD_BRANCH=
49ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
50
51
52WORKDIR /unique_parachain
53
54RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \
55    cd polkadot && \
56    cargo build --release
57
58# ===== RUN ======45# ===== RUN ======
5946
60FROM ubuntu:20.0447FROM ubuntu:20.04
6148
49ARG POLKADOT_BUILD_BRANCH=
50ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
51
62RUN apt-get -y update && \52RUN apt-get -y update && \
63      apt-get -y install curl git && \53      apt-get -y install curl git && \
64      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \54      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \
76    yarn install66    yarn install
7767
78COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/68COPY --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/
80
81COPY --from=builder-unique /unique_parachain/launch-config.json /polkadot-launch/launch-config.json69COPY --from=builder-unique /unique_parachain/launch-config.json /polkadot-launch/launch-config.json
8270
71COPY --from=uniquenetwork/builder-polkadot:$POLKADOT_BUILD_BRANCH /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
8372
84CMD export NVM_DIR="$HOME/.nvm" && \73CMD export NVM_DIR="$HOME/.nvm" && \
85    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \74    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
86    cd /polkadot-launch && \75    cd /polkadot-launch && \
87    yarn start launch-config.json76    yarn start launch-config.json
77
78
8879
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
--- a/.docker/Dockerfile-parachain-upgrade
+++ b/.docker/Dockerfile-parachain-upgrade
@@ -53,25 +53,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 && \
@@ -90,13 +79,12 @@
     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" && \
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/*