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
--- a/.docker/Dockerfile-parachain-upgrade-data
+++ b/.docker/Dockerfile-parachain-upgrade-data
@@ -2,23 +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 && \
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
before · .docker/Dockerfile-xcm.j2
1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ENV CARGO_HOME="/cargo-home"6ENV PATH="/cargo-home/bin:$PATH"7ENV TZ=UTC8RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone910RUN apt-get update && \11    apt-get install -y curl cmake pkg-config libssl-dev git clang llvm libudev-dev protobuf-compiler && \12    apt-get clean && \13    rm -r /var/lib/apt/lists/*1415RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1617RUN rustup toolchain uninstall $(rustup toolchain list) && \18    rustup toolchain install {{ RUST_TOOLCHAIN }} && \19    rustup default {{ RUST_TOOLCHAIN }} && \20    rustup target list --installed && \21    rustup show22RUN rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }}2324RUN mkdir /unique_parachain25WORKDIR /unique_parachain2627# ===== BUILD ======28FROM rust-builder as builder-unique2930ARG PROFILE=release3132WORKDIR /unique_parachain3334COPY ./xcm-config/launch-config-xcm-{{ NETWORK }}.json ./launch-config-xcm-{{ NETWORK }}.json35COPY ./xcm-config/5validators.jsonnet ./5validators.jsonnet36COPY ./xcm-config/minBondFix.jsonnet ./minBondFix.jsonnet3738RUN git clone -b {{ BRANCH }} https://github.com/UniqueNetwork/unique-chain.git && \39    cd unique-chain && \40    cargo build --features={{ NETWORK }}-runtime --$PROFILE4142# ===== RUN ======4344FROM ubuntu:20.044546RUN apt-get -y update && \47      apt-get -y install curl git && \48      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \49      export NVM_DIR="$HOME/.nvm" && \50      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \51      nvm install v16.16.0 && \52      nvm use v16.16.05354RUN git clone https://github.com/uniquenetwork/polkadot-launch -b {{ POLKADOT_LAUNCH_BRANCH }}5556RUN export NVM_DIR="$HOME/.nvm" && \57    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \58    cd /polkadot-launch && \59    npm install --global yarn && \60    yarn install6162COPY --from=builder-unique /unique_parachain/launch-config-xcm-{{ NETWORK }}.json /polkadot-launch/63COPY --from=builder-unique /unique_parachain/5validators.jsonnet /polkadot-launch/5validators.jsonnet64COPY --from=builder-unique /unique_parachain/minBondFix.jsonnet /polkadot-launch/minBondFix.jsonnet6566COPY --from=builder-unique /unique_parachain/unique-chain/target/release/unique-collator /unique-chain/target/release/6768COPY --from=uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/69COPY --from=uniquenetwork/builder-moonbeam:{{ MOONBEAM_BUILD_BRANCH }} /unique_parachain/moonbeam/target/release/moonbeam /moonbeam/target/release/70COPY --from=uniquenetwork/builder-cumulus:{{ CUMULUS_BUILD_BRANCH }} /unique_parachain/cumulus/target/release/polkadot-parachain /cumulus/target/release/cumulus71COPY --from=uniquenetwork/builder-acala:{{ ACALA_BUILD_BRANCH }} /unique_parachain/Acala/target/production/acala /acala/target/release/72COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/7374EXPOSE 984475EXPOSE 993376EXPOSE 994477EXPOSE 994678EXPOSE 994779EXPOSE 99488081CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" && \82    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \83    cd /polkadot-launch && \84    yarn start launch-config-xcm-{{ NETWORK }}.json
after · .docker/Dockerfile-xcm.j2
1# ===== Rust builder =====2FROM uniquenetwork/services:latest as rust-builder3ENV CARGO_HOME="/cargo-home"4ENV PATH="/cargo-home/bin:$PATH"5ENV TZ=UTC67RUN rustup toolchain uninstall $(rustup toolchain list) && \8    rustup toolchain install {{ RUST_TOOLCHAIN }} && \9    rustup default {{ RUST_TOOLCHAIN }} && \10    rustup target list --installed && \11    rustup show12RUN rustup target add wasm32-unknown-unknown --toolchain {{ RUST_TOOLCHAIN }}1314RUN mkdir /unique_parachain15WORKDIR /unique_parachain1617# ===== BUILD ======18FROM rust-builder as builder-unique1920ARG PROFILE=release2122WORKDIR /unique_parachain2324COPY ./xcm-config/launch-config-xcm-{{ NETWORK }}.json ./launch-config-xcm-{{ NETWORK }}.json25COPY ./xcm-config/5validators.jsonnet ./5validators.jsonnet26COPY ./xcm-config/minBondFix.jsonnet ./minBondFix.jsonnet2728RUN git clone -b {{ BRANCH }} https://github.com/UniqueNetwork/unique-chain.git && \29    cd unique-chain && \30    cargo build --features={{ NETWORK }}-runtime --$PROFILE3132# ===== RUN ======3334FROM ubuntu:20.043536RUN apt-get -y update && \37      apt-get -y install curl git && \38      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \39      export NVM_DIR="$HOME/.nvm" && \40      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \41      nvm install v16.16.0 && \42      nvm use v16.16.04344RUN git clone https://github.com/uniquenetwork/polkadot-launch -b {{ POLKADOT_LAUNCH_BRANCH }}4546RUN export NVM_DIR="$HOME/.nvm" && \47    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \48    cd /polkadot-launch && \49    npm install --global yarn && \50    yarn install5152COPY --from=builder-unique /unique_parachain/launch-config-xcm-{{ NETWORK }}.json /polkadot-launch/53COPY --from=builder-unique /unique_parachain/5validators.jsonnet /polkadot-launch/5validators.jsonnet54COPY --from=builder-unique /unique_parachain/minBondFix.jsonnet /polkadot-launch/minBondFix.jsonnet5556COPY --from=builder-unique /unique_parachain/unique-chain/target/release/unique-collator /unique-chain/target/release/5758COPY --from=uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/59COPY --from=uniquenetwork/builder-moonbeam:{{ MOONBEAM_BUILD_BRANCH }} /unique_parachain/moonbeam/target/release/moonbeam /moonbeam/target/release/60COPY --from=uniquenetwork/builder-cumulus:{{ CUMULUS_BUILD_BRANCH }} /unique_parachain/cumulus/target/release/polkadot-parachain /cumulus/target/release/cumulus61COPY --from=uniquenetwork/builder-acala:{{ ACALA_BUILD_BRANCH }} /unique_parachain/Acala/target/production/acala /acala/target/release/62COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/6364EXPOSE 984465EXPOSE 993366EXPOSE 994467EXPOSE 994668EXPOSE 994769EXPOSE 99487071CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" && \72    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \73    cd /polkadot-launch && \74    yarn start launch-config-xcm-{{ NETWORK }}.json