From c7eab883451821b9c17f7e6e979dddaa460637d0 Mon Sep 17 00:00:00 2001
From: Alexander Aksenov <skydeman@gmail.com>
Date: Thu, 04 Aug 2022 09:59:56 +0000
Subject: [PATCH] Removed stale files.


---
--- 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/*
--- 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
--- 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
--- 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 }}"
--- 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

-- 
gitstuff