git.delta.rocks / unique-network / refs/commits / 1fa261934e08

difftreelog

Merge pull request #834 from UniqueNetwork/feature/docker-base-img

Yaroslav Bolyukin2023-01-16parents: #713b8d2 #812b716.patch.diff
in: master
switch to the own docker-base img

9 files changed

modified.docker/Dockerfile-chain-devdiffbeforeafterboth
--- a/.docker/Dockerfile-chain-dev
+++ b/.docker/Dockerfile-chain-dev
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM uniquenetwork/services:latest
 
 ARG RUST_TOOLCHAIN
 ARG NETWORK
@@ -10,10 +10,6 @@
 ENV PATH="/cargo-home/bin:$PATH"
 
 RUN echo "$NETWORK\n" && echo "$RUST_TOOLCHAIN\n"
-
-RUN apt-get update && apt-get install -y git curl libssl-dev llvm pkg-config libclang-dev clang git make cmake protobuf-compiler
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
 
 RUN rustup toolchain uninstall $(rustup toolchain list) && \
     rustup toolchain install $RUST_TOOLCHAIN && \
modified.docker/Dockerfile-chain-dev-unitdiffbeforeafterboth
--- a/.docker/Dockerfile-chain-dev-unit
+++ b/.docker/Dockerfile-chain-dev-unit
@@ -1,14 +1,8 @@
-FROM ubuntu:20.04
+FROM uniquenetwork/services:latest
 
 ENV DEBIAN_FRONTEND=noninteractive
-ENV TZ=Etc/UTC
-
-RUN apt-get update && apt-get install -y git curl libssl-dev llvm pkg-config libclang-dev clang git make cmake protobuf-compiler
-
 ENV CARGO_HOME="/cargo-home"
 ENV PATH="/cargo-home/bin:$PATH"
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
 
 ARG RUST_TOOLCHAIN
 ARG NETWORK
modified.docker/Dockerfile-parachaindiffbeforeafterboth
--- a/.docker/Dockerfile-parachain
+++ b/.docker/Dockerfile-parachain
@@ -2,24 +2,13 @@
 FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot
 
 # ===== Rust builder =====
-FROM ubuntu:20.04 as rust-builder
-LABEL maintainer="Unique.Network"
-
+FROM uniquenetwork/services:latest as rust-builder
 ARG RUST_TOOLCHAIN=
 ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
 
 ENV CARGO_HOME="/cargo-home"
 ENV PATH="/cargo-home/bin:$PATH"
 ENV TZ=UTC
-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 protobuf-compiler && \
-    apt-get clean && \
-    rm -r /var/lib/apt/lists/*
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
-
 RUN rustup toolchain uninstall $(rustup toolchain list) && \
     rustup toolchain install $RUST_TOOLCHAIN && \
     rustup default $RUST_TOOLCHAIN && \
modified.docker/Dockerfile-parachain-node-onlydiffbeforeafterboth
--- a/.docker/Dockerfile-parachain-node-only
+++ b/.docker/Dockerfile-parachain-node-only
@@ -2,24 +2,13 @@
 FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot
 
 # ===== Rust builder =====
-FROM ubuntu:20.04 as rust-builder
-LABEL maintainer="Unique.Network"
+FROM uniquenetwork/services:latest as rust-builder
 
 ARG RUST_TOOLCHAIN=
-
 ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
 ENV CARGO_HOME="/cargo-home"
 ENV PATH="/cargo-home/bin:$PATH"
 ENV TZ=UTC
-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 protobuf-compiler && \
-    apt-get clean && \
-    rm -r /var/lib/apt/lists/*
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
-
 RUN rustup toolchain uninstall $(rustup toolchain list) && \
     rustup toolchain install $RUST_TOOLCHAIN && \
     rustup default $RUST_TOOLCHAIN && \
modified.docker/Dockerfile-parachain-upgradediffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade
+++ b/.docker/Dockerfile-parachain-upgrade
@@ -2,8 +2,7 @@
 FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot
 
 # ===== Rust builder =====
-FROM ubuntu:20.04 as rust-builder
-LABEL maintainer="Unique.Network"
+FROM uniquenetwork/services:latest as rust-builder
 
 ARG RUST_TOOLCHAIN=
 
@@ -11,15 +10,6 @@
 ENV CARGO_HOME="/cargo-home"
 ENV PATH="/cargo-home/bin:$PATH"
 ENV TZ=UTC
-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 protobuf-compiler && \
-    apt-get clean && \
-    rm -r /var/lib/apt/lists/*
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
-
 RUN rustup toolchain uninstall $(rustup toolchain list) && \
     rustup toolchain install $RUST_TOOLCHAIN && \
     rustup default $RUST_TOOLCHAIN && \
modified.docker/Dockerfile-parachain-upgrade-datadiffbeforeafterboth
before · .docker/Dockerfile-parachain-upgrade-data
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_parachain3233# ===== BUILD current version ======34FROM rust-builder as builder-unique-current3536ARG PROFILE=release37ARG NETWORK38ARG MAINNET_BRANCH39ARG REPO_URL4041WORKDIR /unique_parachain4243RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \44    cargo build --features=${NETWORK}-runtime --$PROFILE4546# ===== BUILD target version ======47FROM rust-builder as builder-unique-target4849ARG PROFILE=release50ARG NETWORK51ARG BRANCH52ARG REPO_URL5354COPY . /unique_parachain55WORKDIR /unique_parachain5657RUN cargo build --features=${NETWORK}-runtime --$PROFILE5859# ===== RUN ======60FROM ubuntu:20.046162ARG NETWORK63ARG REPLICA_FROM64ENV REPLICA_FROM=${REPLICA_FROM}65ARG POLKADOT_LAUNCH_BRANCH66ARG WASM_NAME6768RUN apt-get -y update && \69    apt-get -y install curl git && \70    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \71    export NVM_DIR="$HOME/.nvm" && \72    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \73    nvm install v16.16.0 && \74    nvm use v16.16.07576RUN git clone https://github.com/uniquenetwork/polkadot-launch.git -b ${POLKADOT_LAUNCH_BRANCH}7778RUN export NVM_DIR="$HOME/.nvm" && \79    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \80    cd /polkadot-launch && \81    npm install --global yarn && \82    yarn install8384RUN echo "$NETWORK"85RUN echo "$REPLICA_FROM"8687COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/88COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/89COPY --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.wasm9091COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/9293COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/94COPY --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.wasm9596CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" REPLICA_FROM && \97    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \98    cd /polkadot-launch && \99    yarn start launch-config.json --test-upgrade-parachains
after · .docker/Dockerfile-parachain-upgrade-data
1ARG POLKADOT_BUILD_BRANCH2FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot34# ===== Rust builder =====5FROM uniquenetwork/services:latest as rust-builder6ARG RUST_TOOLCHAIN=78ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN9ENV CARGO_HOME="/cargo-home"10ENV PATH="/cargo-home/bin:$PATH"11ENV TZ=UTC1213RUN rustup toolchain uninstall $(rustup toolchain list) && \14    rustup toolchain install $RUST_TOOLCHAIN && \15    rustup default $RUST_TOOLCHAIN && \16    rustup target list --installed && \17    rustup show18RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN1920RUN mkdir /unique_parachain21WORKDIR /unique_parachain2223# ===== BUILD current version ======24FROM rust-builder as builder-unique-current2526ARG PROFILE=release27ARG NETWORK28ARG MAINNET_BRANCH29ARG REPO_URL3031WORKDIR /unique_parachain3233RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \34    cargo build --features=${NETWORK}-runtime --$PROFILE3536# ===== BUILD target version ======37FROM rust-builder as builder-unique-target3839ARG PROFILE=release40ARG NETWORK41ARG BRANCH42ARG REPO_URL4344COPY . /unique_parachain45WORKDIR /unique_parachain4647RUN cargo build --features=${NETWORK}-runtime --$PROFILE4849# ===== RUN ======50FROM ubuntu:20.045152ARG NETWORK53ARG REPLICA_FROM54ENV REPLICA_FROM=${REPLICA_FROM}55ARG POLKADOT_LAUNCH_BRANCH56ARG WASM_NAME5758RUN apt-get -y update && \59    apt-get -y install curl git && \60    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \61    export NVM_DIR="$HOME/.nvm" && \62    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \63    nvm install v16.16.0 && \64    nvm use v16.16.06566RUN git clone https://github.com/uniquenetwork/polkadot-launch.git -b ${POLKADOT_LAUNCH_BRANCH}6768RUN export NVM_DIR="$HOME/.nvm" && \69    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \70    cd /polkadot-launch && \71    npm install --global yarn && \72    yarn install7374RUN echo "$NETWORK"75RUN echo "$REPLICA_FROM"7677COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/78COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/79COPY --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.wasm8081COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/8283COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/84COPY --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.wasm8586CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" REPLICA_FROM && \87    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \88    cd /polkadot-launch && \89    yarn start launch-config.json --test-upgrade-parachains
modified.docker/Dockerfile-testnet.j2diffbeforeafterboth
--- a/.docker/Dockerfile-testnet.j2
+++ b/.docker/Dockerfile-testnet.j2
@@ -1,18 +1,11 @@
 # ===== Rust builder =====
-FROM ubuntu:20.04 as rust-builder
-LABEL maintainer="Unique.Network"
+FROM uniquenetwork/services:latest as rust-builder
+ARG RUST_TOOLCHAIN=
 
+ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
 ENV CARGO_HOME="/cargo-home"
 ENV PATH="/cargo-home/bin:$PATH"
 ENV TZ=UTC
-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 protobuf-compiler && \
-    apt-get clean && \
-    rm -r /var/lib/apt/lists/*
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
 
 RUN rustup toolchain uninstall $(rustup toolchain list) && \
     rustup toolchain install {{ RUST_TOOLCHAIN }} && \
modified.docker/Dockerfile-try-runtimediffbeforeafterboth
--- a/.docker/Dockerfile-try-runtime
+++ b/.docker/Dockerfile-try-runtime
@@ -1,6 +1,5 @@
 # ===== Rust builder =====
-FROM ubuntu:20.04 as rust-builder
-LABEL maintainer="Unique.Network"
+FROM uniquenetwork/services:latest as rust-builder
 
 ARG RUST_TOOLCHAIN
 
@@ -8,15 +7,6 @@
 ENV CARGO_HOME="/cargo-home"
 ENV PATH="/cargo-home/bin:$PATH"
 ENV TZ=UTC
-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 protobuf-compiler && \
-    apt-get clean && \
-    rm -r /var/lib/apt/lists/*
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
 
 RUN rustup toolchain uninstall $(rustup toolchain list) && \
     rustup toolchain install $RUST_TOOLCHAIN && \
modified.docker/Dockerfile-xcm.j2diffbeforeafterboth
--- a/.docker/Dockerfile-xcm.j2
+++ b/.docker/Dockerfile-xcm.j2
@@ -1,18 +1,8 @@
 # ===== Rust builder =====
-FROM ubuntu:20.04 as rust-builder
-LABEL maintainer="Unique.Network"
-
+FROM uniquenetwork/services:latest as rust-builder
 ENV CARGO_HOME="/cargo-home"
 ENV PATH="/cargo-home/bin:$PATH"
 ENV TZ=UTC
-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 protobuf-compiler && \
-    apt-get clean && \
-    rm -r /var/lib/apt/lists/*
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
 
 RUN rustup toolchain uninstall $(rustup toolchain list) && \
     rustup toolchain install {{ RUST_TOOLCHAIN }} && \