git.delta.rocks / unique-network / refs/commits / ae379cd8ab7c

difftreelog

migrate to ubuntu:22.04

Konstantin Astakhov2023-03-29parent: #93c5da3.patch.diff
in: master

16 files changed

modified.docker/Dockerfile-acala.j2diffbeforeafterboth
--- a/.docker/Dockerfile-acala.j2
+++ b/.docker/Dockerfile-acala.j2
@@ -1,5 +1,5 @@
 # ===== Rust builder =====
-FROM ubuntu:20.04 as rust-builder
+FROM ubuntu:22.04 as rust-builder
 LABEL maintainer="Unique.Network"
 
 ENV CARGO_HOME="/cargo-home"
@@ -36,6 +36,6 @@
 
 # ===== BIN ======
 
-FROM ubuntu:20.04 as builder-acala
+FROM ubuntu:22.04 as builder-acala
 
 COPY --from=builder-acala-bin /unique_parachain/Acala/target/production/acala /unique_parachain/Acala/target/production/acala
modified.docker/Dockerfile-collatorsdiffbeforeafterboth
--- a/.docker/Dockerfile-collators
+++ b/.docker/Dockerfile-collators
@@ -38,7 +38,7 @@
 
 # ===== RUN ======
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get -y update && \
       apt-get -y install curl git && \
modified.docker/Dockerfile-cumulus.j2diffbeforeafterboth
--- a/.docker/Dockerfile-cumulus.j2
+++ b/.docker/Dockerfile-cumulus.j2
@@ -1,5 +1,5 @@
 # ===== Rust builder =====
-FROM ubuntu:20.04 as rust-builder
+FROM ubuntu:22.04 as rust-builder
 LABEL maintainer="Unique.Network"
 
 ENV CARGO_HOME="/cargo-home"
@@ -35,6 +35,6 @@
 
 # ===== BIN ======
 
-FROM ubuntu:20.04 as builder-cumulus
+FROM ubuntu:22.04 as builder-cumulus
 
 COPY --from=builder-cumulus-bin /unique_parachain/cumulus/target/release/polkadot-parachain /unique_parachain/cumulus/target/release/polkadot-parachain
modified.docker/Dockerfile-moonbeam.j2diffbeforeafterboth
--- a/.docker/Dockerfile-moonbeam.j2
+++ b/.docker/Dockerfile-moonbeam.j2
@@ -1,5 +1,5 @@
 # ===== Rust builder =====
-FROM ubuntu:20.04 as rust-builder
+FROM ubuntu:22.04 as rust-builder
 LABEL maintainer="Unique.Network"
 
 ENV CARGO_HOME="/cargo-home"
@@ -36,6 +36,6 @@
 
 # ===== BIN ======
 
-FROM ubuntu:20.04 as builder-moonbeam
+FROM ubuntu:22.04 as builder-moonbeam
 
 COPY --from=builder-moonbeam-bin /unique_parachain/moonbeam/target/release/moonbeam /unique_parachain/moonbeam/target/release/moonbeam
modified.docker/Dockerfile-parachaindiffbeforeafterboth
before · .docker/Dockerfile-parachain
1ARG POLKADOT_BUILD_BRANCH2FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot34# ===== Rust builder =====5FROM uniquenetwork/services:latest as rust-builder6ARG RUST_TOOLCHAIN=7ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN89ENV CARGO_HOME="/cargo-home"10ENV PATH="/cargo-home/bin:$PATH"11ENV TZ=UTC12RUN rustup toolchain uninstall $(rustup toolchain list) && \13    rustup toolchain install $RUST_TOOLCHAIN && \14    rustup default $RUST_TOOLCHAIN && \15    rustup target list --installed && \16    rustup show17RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN1819RUN mkdir /unique_parachain20WORKDIR /unique_parachain212223# ===== BUILD ======24FROM rust-builder as builder-unique2526ARG PROFILE=release27ARG NETWORK28ARG REPO_URL29ARG BRANCH3031RUN echo "NETWORK="${NETWORK}3233WORKDIR /unique_parachain3435RUN git clone https://github.com/UniqueNetwork/unique-chain.git -b $BRANCH . && \36    cargo build --features=${NETWORK}-runtime --$PROFILE3738# ===== RUN ======3940FROM ubuntu:20.044142ARG POLKADOT_LAUNCH_BRANCH=4344RUN apt-get -y update && \45      apt-get -y install curl git && \46      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \47      export NVM_DIR="$HOME/.nvm" && \48      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \49      nvm install v16.16.0 && \50      nvm use v16.16.05152RUN git clone https://github.com/uniquenetwork/polkadot-launch -b ${POLKADOT_LAUNCH_BRANCH}5354RUN export NVM_DIR="$HOME/.nvm" && \55    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \56    cd /polkadot-launch && \57    npm install --global yarn && \58    yarn install5960COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/61COPY --from=builder-unique /unique_parachain/launch-config.json /polkadot-launch/launch-config.json6263COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/6465CMD export NVM_DIR="$HOME/.nvm" && \66    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \67    cd /polkadot-launch && \68    yarn start launch-config.json
after · .docker/Dockerfile-parachain
1ARG POLKADOT_BUILD_BRANCH2FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot34# ===== Rust builder =====5FROM uniquenetwork/services:latest as rust-builder6ARG RUST_TOOLCHAIN=7ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN89ENV CARGO_HOME="/cargo-home"10ENV PATH="/cargo-home/bin:$PATH"11ENV TZ=UTC12RUN rustup toolchain uninstall $(rustup toolchain list) && \13    rustup toolchain install $RUST_TOOLCHAIN && \14    rustup default $RUST_TOOLCHAIN && \15    rustup target list --installed && \16    rustup show17RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN1819RUN mkdir /unique_parachain20WORKDIR /unique_parachain212223# ===== BUILD ======24FROM rust-builder as builder-unique2526ARG PROFILE=release27ARG NETWORK28ARG REPO_URL29ARG BRANCH3031RUN echo "NETWORK="${NETWORK}3233WORKDIR /unique_parachain3435RUN git clone https://github.com/UniqueNetwork/unique-chain.git -b $BRANCH . && \36    cargo build --features=${NETWORK}-runtime --$PROFILE3738# ===== RUN ======3940FROM ubuntu:22.044142ARG POLKADOT_LAUNCH_BRANCH=4344RUN apt-get -y update && \45      apt-get -y install curl git && \46      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \47      export NVM_DIR="$HOME/.nvm" && \48      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \49      nvm install v16.16.0 && \50      nvm use v16.16.05152RUN git clone https://github.com/uniquenetwork/polkadot-launch -b ${POLKADOT_LAUNCH_BRANCH}5354RUN export NVM_DIR="$HOME/.nvm" && \55    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \56    cd /polkadot-launch && \57    npm install --global yarn && \58    yarn install5960COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/61COPY --from=builder-unique /unique_parachain/launch-config.json /polkadot-launch/launch-config.json6263COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/6465CMD export NVM_DIR="$HOME/.nvm" && \66    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \67    cd /polkadot-launch && \68    yarn start launch-config.json
modified.docker/Dockerfile-parachain-node-onlydiffbeforeafterboth
--- a/.docker/Dockerfile-parachain-node-only
+++ b/.docker/Dockerfile-parachain-node-only
@@ -46,7 +46,7 @@
 
 # ===== RUN ======
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ARG NETWORK
 ARG POLKADOT_LAUNCH_BRANCH
modified.docker/Dockerfile-parachain-upgradediffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade
+++ b/.docker/Dockerfile-parachain-upgrade
@@ -45,7 +45,7 @@
 RUN cargo build --features=${NETWORK}-runtime --$PROFILE
 
 # ===== RUN ======
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ARG NETWORK
 ARG POLKADOT_LAUNCH_BRANCH
modified.docker/Dockerfile-parachain-upgrade-datadiffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade-data
+++ b/.docker/Dockerfile-parachain-upgrade-data
@@ -47,7 +47,7 @@
 RUN cargo build --features=${NETWORK}-runtime --$PROFILE
 
 # ===== RUN ======
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ARG NETWORK
 ARG REPLICA_FROM
modified.docker/Dockerfile-polkadot.j2diffbeforeafterboth
--- a/.docker/Dockerfile-polkadot.j2
+++ b/.docker/Dockerfile-polkadot.j2
@@ -1,5 +1,5 @@
 # ===== Rust builder =====
-FROM ubuntu:20.04 as rust-builder
+FROM ubuntu:22.04 as rust-builder
 LABEL maintainer="Unique.Network"
 
 ENV CARGO_HOME="/cargo-home"
@@ -35,6 +35,6 @@
 
 # ===== BIN ======
 
-FROM ubuntu:20.04 as builder-polkadot
+FROM ubuntu:22.04 as builder-polkadot
 
 COPY --from=builder-polkadot-bin /unique_parachain/polkadot/target/release/polkadot /unique_parachain/polkadot/target/release/polkadot
modified.docker/Dockerfile-testnet.j2diffbeforeafterboth
--- a/.docker/Dockerfile-testnet.j2
+++ b/.docker/Dockerfile-testnet.j2
@@ -30,7 +30,7 @@
 
 # ===== RUN ======
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get -y update && \
       apt-get -y install curl git && \
modified.docker/Dockerfile-xcm.j2diffbeforeafterboth
--- a/.docker/Dockerfile-xcm.j2
+++ b/.docker/Dockerfile-xcm.j2
@@ -30,7 +30,7 @@
 
 # ===== RUN ======
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get -y update && \
       apt-get -y install curl git && \
modified.docker/additional/Dockerfile-polkadotdiffbeforeafterboth
--- a/.docker/additional/Dockerfile-polkadot
+++ b/.docker/additional/Dockerfile-polkadot
@@ -1,5 +1,5 @@
 # ===== Rust builder =====
-FROM ubuntu:20.04 as rust-builder
+FROM ubuntu:22.04 as rust-builder
 LABEL maintainer="Unique.Network"
 
 ARG RUST_TOOLCHAIN=nightly-2022-10-09
@@ -39,7 +39,7 @@
 
 # ===== BIN ======
 
-FROM ubuntu:20.04 as builder-polkadot
+FROM ubuntu:22.04 as builder-polkadot
 
 COPY --from=builder-polkadot-bin /unique_parachain/polkadot/target/release/polkadot /unique_parachain/polkadot/target/release/polkadot
 COPY --from=builder-polkadot-bin /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm
modified.docker/additional/xcm-rococo/Dockerfile-xcm-opal-rococo.tempdiffbeforeafterboth
--- a/.docker/additional/xcm-rococo/Dockerfile-xcm-opal-rococo.temp
+++ b/.docker/additional/xcm-rococo/Dockerfile-xcm-opal-rococo.temp
@@ -2,7 +2,7 @@
 FROM uniquenetwork/builder-cumulus:{{ STATEMINE_BUILD_BRANCH }} as cumulus
 
 # ===== Rust builder =====
-FROM ubuntu:20.04 as rust-builder
+FROM ubuntu:22.04 as rust-builder
 LABEL maintainer="Unique.Network"
 
 ENV CARGO_HOME="/cargo-home"
@@ -41,7 +41,7 @@
   cargo build --features=opal-runtime --$PROFILE
 
 # ===== RUN ======
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get -y update && \
       apt-get -y install curl git && \
modified.docker/additional/xcm-rococo/Dockerfile-xcm-quartz-rococo.tempdiffbeforeafterboth
--- a/.docker/additional/xcm-rococo/Dockerfile-xcm-quartz-rococo.temp
+++ b/.docker/additional/xcm-rococo/Dockerfile-xcm-quartz-rococo.temp
@@ -4,7 +4,7 @@
 FROM uniquenetwork/builder-acala:{{ KARURA_BUILD_BRANCH }} as acala
 
 # ===== Rust builder =====
-FROM ubuntu:20.04 as rust-builder
+FROM ubuntu:22.04 as rust-builder
 LABEL maintainer="Unique.Network"
 
 ENV CARGO_HOME="/cargo-home"
@@ -43,7 +43,7 @@
   cargo build --features=quartz-runtime --$PROFILE
 
 # ===== RUN ======
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get -y update && \
       apt-get -y install curl git && \
modified.docker/additional/xcm-rococo/Dockerfile-xcm-unique-rococo.tempdiffbeforeafterboth
--- a/.docker/additional/xcm-rococo/Dockerfile-xcm-unique-rococo.temp
+++ b/.docker/additional/xcm-rococo/Dockerfile-xcm-unique-rococo.temp
@@ -4,7 +4,7 @@
 FROM uniquenetwork/builder-acala:{{ ACALA_BUILD_BRANCH }} as acala
 
 # ===== Rust builder =====
-FROM ubuntu:20.04 as rust-builder
+FROM ubuntu:22.04 as rust-builder
 LABEL maintainer="Unique.Network"
 
 ENV CARGO_HOME="/cargo-home"
@@ -43,7 +43,7 @@
   cargo build --features=unique-runtime --$PROFILE
 
 # ===== RUN ======
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get -y update && \
       apt-get -y install curl git && \
modifiedtests/Dockerfile-testsdiffbeforeafterboth
--- a/tests/Dockerfile-tests
+++ b/tests/Dockerfile-tests
@@ -1,7 +1,7 @@
 # ===== Integration Tests ======
 
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 LABEL maintainer="UniqueNetwork.io"
 
 RUN apt -y update; apt -y upgrade; apt -y install curl