difftreelog
Removed stale files.
in: master
5 files changed
.docker/Dockerfile-parachaindiffbeforeafterboth1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=nightly-2022-05-1167ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN8ENV CARGO_HOME="/cargo-home"9ENV PATH="/cargo-home/bin:$PATH"1011RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1213RUN apt-get update && \14 apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \15 apt-get install -y cmake pkg-config libssl-dev git clang && \16 apt-get clean && \17 rm -r /var/lib/apt/lists/*1819RUN rustup toolchain uninstall $(rustup toolchain list) && \20 rustup toolchain install $RUST_TOOLCHAIN && \21 rustup default $RUST_TOOLCHAIN && \22 rustup target list --installed && \23 rustup show24RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN2526RUN pwd && ls -la2728RUN mkdir unique_parachain29WORKDIR /unique_parachain3031# ===== BUILD ======32FROM rust-builder as builder-unique3334ARG PROFILE=release3536RUN mkdir unique_parachain37WORKDIR /unique_parachain3839RUN pwd && ls -la40COPY . .41RUN cargo build --$PROFILE42 # && \43 # cargo test4445# ===== BUILD POLKADOT =====46FROM rust-builder as builder-polkadot4748ARG POLKA_VERSION=release-v0.9.2449ENV POLKA_VERSION $POLKA_VERSION5051RUN mkdir unique_parachain52WORKDIR /unique_parachain5354RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \55 cd polkadot && \56 cargo build --release5758# ===== RUN ======5960FROM ubuntu:20.046162RUN apt-get -y update && \63 apt-get -y upgrade && \64 apt-get -y install curl git && \65 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \66 export NVM_DIR="$HOME/.nvm" && \67 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \68 nvm install v16.16.0 && \69 nvm use v16.16.07071RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing7273RUN export NVM_DIR="$HOME/.nvm" && \74 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \75 cd /polkadot-launch && \76 npm install --global yarn && \77 yarn install7879COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/80COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/8182COPY ["./launch-config.json", "/polkadot-launch/launch-config.json"]838485CMD export NVM_DIR="$HOME/.nvm" && \86 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \87 cd /polkadot-launch && \88 yarn start launch-config.json1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=nightly-2022-05-1167ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN8ENV CARGO_HOME="/cargo-home"9ENV PATH="/cargo-home/bin:$PATH"1011RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1213RUN apt-get update && \14 apt-get install -y cmake pkg-config libssl-dev git clang && \15 apt-get clean && \16 rm -r /var/lib/apt/lists/*1718RUN rustup toolchain uninstall $(rustup toolchain list) && \19 rustup toolchain install $RUST_TOOLCHAIN && \20 rustup default $RUST_TOOLCHAIN && \21 rustup target list --installed && \22 rustup show23RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN2425RUN pwd && ls -la2627RUN mkdir unique_parachain28WORKDIR /unique_parachain2930# ===== BUILD ======31FROM rust-builder as builder-unique3233ARG PROFILE=release3435RUN mkdir unique_parachain36WORKDIR /unique_parachain3738RUN pwd && ls -la39COPY . .40RUN cargo build --$PROFILE41 # && \42 # cargo test4344# ===== BUILD POLKADOT =====45FROM rust-builder as builder-polkadot4647ARG POLKA_VERSION=release-v0.9.2448ENV POLKA_VERSION $POLKA_VERSION4950RUN mkdir unique_parachain51WORKDIR /unique_parachain5253RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \54 cd polkadot && \55 cargo build --release5657# ===== RUN ======5859FROM ubuntu:20.046061RUN apt-get -y update && \62 apt-get -y upgrade && \63 apt-get -y install curl git && \64 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \65 export NVM_DIR="$HOME/.nvm" && \66 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \67 nvm install v16.16.0 && \68 nvm use v16.16.06970RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing7172RUN export NVM_DIR="$HOME/.nvm" && \73 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \74 cd /polkadot-launch && \75 npm install --global yarn && \76 yarn install7778COPY --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/8081COPY ["./launch-config.json", "/polkadot-launch/launch-config.json"]828384CMD export NVM_DIR="$HOME/.nvm" && \85 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \86 cd /polkadot-launch && \87 yarn start launch-config.json.docker/Dockerfile-parachain-v2diffbeforeafterboth--- a/.docker/Dockerfile-parachain-v2
+++ /dev/null
@@ -1,97 +0,0 @@
-# ===== Rust builder =====
-FROM phusion/baseimage:focal-1.1.0 as rust-builder
-LABEL maintainer="Unique.Network"
-
-ARG RUST_TOOLCHAIN={{ actual_toolchain }}
-ARG POLKA_VERSION=release-v0.9.24
-
-
-ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
-ENV POLKA_VERSION $POLKA_VERSION
-
-ENV CARGO_HOME="/cargo-home"
-ENV PATH="/cargo-home/bin:$PATH"
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
-
-RUN apt-get update && \
- apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \
- apt-get install -y cmake pkg-config libssl-dev git clang
-
-RUN rustup toolchain uninstall $(rustup toolchain list) && \
- rustup toolchain install $RUST_TOOLCHAIN && \
- rustup default $RUST_TOOLCHAIN && \
- rustup target list --installed && \
- rustup show
-RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN
-
-####works inside repo folder###
-
-
-# ===== BUILD ======
-FROM rust-builder as builder-unique
-
-RUN mkdir unique_parachain
-WORKDIR /unique_parachain
-
-ARG PROFILE='features=quartz-runtime'
-
-ENV PROFILE $PROFILE
-
-COPY . .
-RUN cargo build --$PROFILE
- # && \
- # cargo test
-
-# ===== BUILD POLKADOT =====
-FROM rust-builder as builder-polkadot
-
-RUN mkdir unique_parachain
-WORKDIR /unique_parachain
-
-RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \
- cd polkadot && \
- git tag -n && \
- cargo build --release
-
-# ===== RUN ======
-
-FROM phusion/baseimage:focal-1.1.0
-
-
-RUN apt-get -y update && \
- apt-get -y upgrade && \
- apt-get -y install curl git && \
- curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \
- export NVM_DIR="$HOME/.nvm" && \
- [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
- nvm install v15.5.0 && \
- nvm use v15.5.0
-
-RUN git clone https://github.com/UniqueNetwork/polkadot-launch.git && \
- cd ./polkadot-launch && \
- git checkout feature/runtime-upgrade-testing
-
-RUN export NVM_DIR="$HOME/.nvm" && \
- [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
- cd /polkadot-launch && \
- npm install --global yarn && \
- yarn
-
-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 ["./launch-config.json", "/polkadot-launch/launch-config.json"]
-
-
-EXPOSE 9844
-EXPOSE 9944
-EXPOSE 9933
-EXPOSE 9833
-EXPOSE 40333
-EXPOSE 30333
-
-CMD export NVM_DIR="$HOME/.nvm" && \
- [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
- cd /polkadot-launch && \
- yarn start launch-config.json
.docker/docker-compose-tests-parachain.ymldiffbeforeafterboth--- a/.docker/docker-compose-tests-parachain.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-version: "3.5"
-
-services:
- blockchain_nodes:
- build:
- context: ../
- dockerfile: .docker/Dockerfile-parachain
- args:
- - RUST_TOOLCHAIN=${RUST_TOOLCHAIN:?err}
- - RUST_C=${RUST_C:?err}
- - POLKA_VERSION=${POLKA_VERSION:?err}
- - FEATURE=${FEATURE:?err}
- volumes:
- - ../launch-config.json:/polkadot-launch/launch-config.json
- env_file:
- - ./.env
- expose:
- - 9944
- - 9933
- ports:
- - 127.0.0.1:9944:9944
- - 127.0.0.1:9933:9933
-
-# integration_tests:
-# build:
-# context: ../tests/
-# dockerfile: Dockerfile-tests
-# environment:
-# RPC_URL: http://blockchain_nodes:9933/
-# volumes:
-# - ./tests/src/config_docker.ts:/unique_parachain/src/config.ts
-# - /home/ubuntu/mochawesome-report:/unique_parachain/mochawesome-report
-# depends_on:
-# - blockchain_nodes
.docker/docker-compose.tmp-master.j2diffbeforeafterboth--- a/.docker/docker-compose.tmp-master.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-version: "3.5"
-
-services:
- blockchain_nodes:
- build:
- args:
- - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
- - "BRANCH={{ BRANCH }}"
- - "REPO_URL={{ REPO_URL }}"
- - "FEATURE={{ FEATURE }}"
.docker/docker-compose.tmp.j2diffbeforeafterboth--- a/.docker/docker-compose.tmp.j2
+++ b/.docker/docker-compose.tmp.j2
@@ -4,7 +4,6 @@
node-dev:
build:
args:
-<<<<<<< HEAD
- "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN:?err }}"
- "BRANCH={{ BRANCH:?err }}"
- "REPO_URL={{ REPO_URL:?err }}"
@@ -12,9 +11,3 @@
- "POLKA_VERSION={{ POLKA_VERSION:?err }}"
command: cargo run --release $FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
-=======
- - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
- - "BRANCH={{ BRANCH }}"
- - "REPO_URL={{ REPO_URL }}"
- - "FEATURE={{ FEATURE }}"
->>>>>>> develop