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
--- 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
5353
54RUN cargo build --features=$FEATURE --$PROFILE54RUN cargo build --features=$FEATURE --$PROFILE
5555
56# ===== BUILD POLKADOT =====
57FROM rust-builder as builder-polkadot
58
59ARG POLKADOT_BUILD_BRANCH=
60ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
61
62WORKDIR /unique_parachain
63
64RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \
65    cd polkadot && \
66    cargo build --release
67
68# ===== BUILD CHAINQL =====
69FROM rust-builder as builder-chainql
70
71RUN mkdir chainql
72WORKDIR /chainql
73
74RUN git clone -b v0.2.0 --depth 1 https://github.com/CertainLach/chainql.git . && \
75    cargo build --release
76
77# ===== RUN ======56# ===== RUN ======
7857
79FROM ubuntu:20.0458FROM ubuntu:20.04
8059
81ARG RUNTIME=60ARG RUNTIME=
82ENV RUNTIME $RUNTIME61ENV RUNTIME $RUNTIME
62ARG REPLICA_FROM=
63ENV REPLICA_FROM=$REPLICA_FROM
64ARG POLKADOT_BUILD_BRANCH=
65ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
8366
84RUN apt-get -y update && \67RUN apt-get -y update && \
85    apt-get -y install curl git && \68    apt-get -y install curl git && \
98    yarn install81    yarn install
9982
100RUN echo "$RUNTIME"83RUN echo "$RUNTIME"
84RUN echo "$REPLICA_FROM"
85RUN echo "$POLKADOT_BUILD_BRANCH"
10186
102COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/87COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/
103COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/88COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/
104COPY --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
10589
106COPY --from=builder-chainql /chainql/target/release/chainql /chainql/target/release/90COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/
10791
108COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/92COPY --from=uniquenetwork/builder-polkadot:$POLKADOT_BUILD_BRANCH /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
109COPY --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
11093
111ARG REPLICA_FROM=
112ENV REPLICA_FROM=$REPLICA_FROM
113CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" REPLICA_FROM && \94CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" REPLICA_FROM && \
114    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \95    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
115    cd /polkadot-launch && \96    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/*