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

difftreelog

Removed stale files.

Alexander Aksenov2022-08-04parent: #0ad944f.patch.diff
in: master

5 files changed

modified.docker/Dockerfile-parachaindiffbeforeafterboth
--- a/.docker/Dockerfile-parachain
+++ b/.docker/Dockerfile-parachain
@@ -11,7 +11,6 @@
 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 && \
     apt-get clean && \
     rm -r /var/lib/apt/lists/*
deleted.docker/Dockerfile-parachain-v2diffbeforeafterboth
before · .docker/Dockerfile-parachain-v2
1# ===== Rust builder =====2FROM phusion/baseimage:focal-1.1.0 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN={{ actual_toolchain }}6ARG POLKA_VERSION=release-v0.9.24789ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN10ENV POLKA_VERSION $POLKA_VERSION1112ENV CARGO_HOME="/cargo-home"13ENV PATH="/cargo-home/bin:$PATH"1415RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1617RUN apt-get update && \18    apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \19    apt-get install -y cmake pkg-config libssl-dev git clang2021RUN rustup toolchain uninstall $(rustup toolchain list) && \22    rustup toolchain install $RUST_TOOLCHAIN && \23    rustup default $RUST_TOOLCHAIN && \24    rustup target list --installed && \25    rustup show26RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN2728####works inside repo folder###293031# ===== BUILD ======32FROM rust-builder as builder-unique3334RUN mkdir unique_parachain35WORKDIR /unique_parachain3637ARG PROFILE='features=quartz-runtime'3839ENV PROFILE $PROFILE4041COPY . .42RUN cargo build --$PROFILE43   # && \44   # cargo test4546# ===== BUILD POLKADOT =====47FROM rust-builder as builder-polkadot4849RUN mkdir unique_parachain50WORKDIR /unique_parachain5152RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \53    cd polkadot && \54    git tag -n && \55	cargo build --release5657# ===== RUN ======5859FROM phusion/baseimage:focal-1.1.0606162RUN 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 v15.5.0 && \69      nvm use v15.5.07071RUN git clone https://github.com/UniqueNetwork/polkadot-launch.git && \72    cd ./polkadot-launch && \73    git checkout feature/runtime-upgrade-testing7475RUN export NVM_DIR="$HOME/.nvm" && \76    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \77    cd /polkadot-launch && \78    npm install --global yarn && \79    yarn8081COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/82COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/8384COPY ["./launch-config.json", "/polkadot-launch/launch-config.json"]858687EXPOSE 984488EXPOSE 994489EXPOSE 993390EXPOSE 983391EXPOSE 4033392EXPOSE 303339394CMD export NVM_DIR="$HOME/.nvm" && \95    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \96    cd /polkadot-launch && \97    yarn start launch-config.json
deleted.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
deleted.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 }}"
modified.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