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

difftreelog

fix repo name

Igor Kozyrev2021-11-22parent: #23a018e.patch.diff
in: master

5 files changed

modified.devcontainer/devcontainer.jsondiffbeforeafterboth
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,8 +1,8 @@
 {
 	"name": "Rust",
     "dockerComposeFile": "./docker-compose.yml",
-    "service": "nft_private",
-    "workspaceFolder": "/workspaces/nft_private",
+    "service": "unique-chain",
+    "workspaceFolder": "/workspaces/unique-chain",
 	"settings": { 
 		"terminal.integrated.shell.linux": "/bin/bash",
 		"lldb.executable": "/usr/bin/lldb",
modified.devcontainer/docker-compose.ymldiffbeforeafterboth
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -1,13 +1,13 @@
 version: '3'
 services:
-  nft_private:
+  unique-chain:
     build: 
         context: .
     environment:
       - JAEGER_AGENT_HOST=jaeger
       - JAEGER_AGENT_PORT=6831
     volumes:
-      - ..:/workspaces/nft_private:cached
+      - ..:/workspaces/unique-chain:cached
       - ../../polkadot:/workspaces/polkadot:cached
       - ../../polkadot-launch:/workspaces/polkadot-launch:cached
       #- ../../frontier:/workspaces/frontier
modified.github/workflows/node_build_test.ymldiffbeforeafterboth
--- a/.github/workflows/node_build_test.yml
+++ b/.github/workflows/node_build_test.yml
@@ -35,10 +35,10 @@
           script: |
             eval $(ssh-agent -s)
             ssh-add /home/devops/.ssh/git_hub
-            git clone git@github.com:UniqueNetwork/nft_private.git
-            cd nft_private
+            git clone git@github.com:UniqueNetwork/unique-chain.git
+            cd unique-chain
             git checkout develop
             # git pull --all
             chmod +x ci_node.sh
             ./ci_node.sh
-            rm -rf /home/polkadot/nft_private
+            rm -rf /home/polkadot/unique-chain
modifiedDockerfile-parachaindiffbeforeafterboth
before · Dockerfile-parachain
1# ===== Rust builder =====2FROM phusion/baseimage:focal-1.0.0 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=nightly-2021-06-286#ARG RUST_C=1.55.0-nightly7ARG POLKA_VERSION=v0.9.128ARG NFT_BRANCH=develop910#ARG USER=***11#ARG PASS=***121314ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN15#ENV RUST_C $RUST_C16ENV POLKA_VERSION $POLKA_VERSION17ENV NFT_BRANCH $NFT_BRANCH181920#RUN echo $RUST_TOOLCHAIN21#RUN echo $RUST_C22#RUN echo $POLKA_VERSION23#RUN echo $NFT_BRANCH2425ENV CARGO_HOME="/cargo-home"26ENV PATH="/cargo-home/bin:$PATH"2728RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none2930RUN apt-get update && \31    apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \32    apt-get install -y cmake pkg-config libssl-dev git clang3334RUN rustup toolchain uninstall $(rustup toolchain list) && \35    rustup toolchain install $RUST_TOOLCHAIN && \36    rustup default $RUST_TOOLCHAIN && \37    rustup target list --installed && \38    rustup show39RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN4041RUN cargo install cargo-chef4243RUN mkdir nft_parachain44WORKDIR /nft_parachain4546# ===== Chef =====47FROM rust-builder as chef4849COPY . .50RUN cargo chef prepare --recipe-path recipe.json5152# ===== BUILD ======53FROM rust-builder as builder5455RUN mkdir nft_parachain56WORKDIR /nft_parachain5758COPY --from=chef /nft_parachain/recipe.json recipe.json59ARG PROFILE=release60RUN cargo chef cook "--$PROFILE" --recipe-path recipe.json6162COPY . .63RUN cargo build "--$PROFILE"64   # && \65   # cargo test6667# ===== BUILD POLKADOT =====68FROM rust-builder as builder-polkadot6970RUN mkdir nft_parachain71WORKDIR /nft_parachain7273RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \74    cd polkadot && \75    git tag -n && \76	cargo build --release7778# ===== RUN ======7980FROM phusion/baseimage:focal-1.0.08182ARG PROFILE=release8384RUN apt-get -y update && \85      apt-get -y upgrade && \86      apt-get -y install curl git && \87      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \88      export NVM_DIR="$HOME/.nvm" && \89      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \90      nvm install v15.5.0 && \91      nvm use v15.5.09293RUN git clone https://github.com/paritytech/polkadot-launch.git9495RUN export NVM_DIR="$HOME/.nvm" && \96    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \97    cd /polkadot-launch && \98    npm install --global yarn && \99    yarn100101COPY --from=builder /nft_parachain/target/$PROFILE/nft /nft_private/target/$PROFILE/102COPY --from=builder-polkadot /nft_parachain/polkadot/target/$PROFILE/polkadot /polkadot/target/$PROFILE/103104CMD export NVM_DIR="$HOME/.nvm" && \105    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \106    cd /polkadot-launch && \107    yarn start launch-config.json
after · Dockerfile-parachain
1# ===== Rust builder =====2FROM phusion/baseimage:focal-1.0.0 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=nightly-2021-06-286#ARG RUST_C=1.55.0-nightly7ARG POLKA_VERSION=v0.9.128ARG NFT_BRANCH=develop910#ARG USER=***11#ARG PASS=***121314ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN15#ENV RUST_C $RUST_C16ENV POLKA_VERSION $POLKA_VERSION17ENV NFT_BRANCH $NFT_BRANCH181920#RUN echo $RUST_TOOLCHAIN21#RUN echo $RUST_C22#RUN echo $POLKA_VERSION23#RUN echo $NFT_BRANCH2425ENV CARGO_HOME="/cargo-home"26ENV PATH="/cargo-home/bin:$PATH"2728RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none2930RUN apt-get update && \31    apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \32    apt-get install -y cmake pkg-config libssl-dev git clang3334RUN rustup toolchain uninstall $(rustup toolchain list) && \35    rustup toolchain install $RUST_TOOLCHAIN && \36    rustup default $RUST_TOOLCHAIN && \37    rustup target list --installed && \38    rustup show39RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN4041RUN cargo install cargo-chef4243RUN mkdir nft_parachain44WORKDIR /nft_parachain4546# ===== Chef =====47FROM rust-builder as chef4849COPY . .50RUN cargo chef prepare --recipe-path recipe.json5152# ===== BUILD ======53FROM rust-builder as builder5455RUN mkdir nft_parachain56WORKDIR /nft_parachain5758COPY --from=chef /nft_parachain/recipe.json recipe.json59ARG PROFILE=release60RUN cargo chef cook "--$PROFILE" --recipe-path recipe.json6162COPY . .63RUN cargo build "--$PROFILE"64   # && \65   # cargo test6667# ===== BUILD POLKADOT =====68FROM rust-builder as builder-polkadot6970RUN mkdir nft_parachain71WORKDIR /nft_parachain7273RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \74    cd polkadot && \75    git tag -n && \76	cargo build --release7778# ===== RUN ======7980FROM phusion/baseimage:focal-1.0.08182ARG PROFILE=release8384RUN apt-get -y update && \85      apt-get -y upgrade && \86      apt-get -y install curl git && \87      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \88      export NVM_DIR="$HOME/.nvm" && \89      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \90      nvm install v15.5.0 && \91      nvm use v15.5.09293RUN git clone https://github.com/paritytech/polkadot-launch.git9495RUN export NVM_DIR="$HOME/.nvm" && \96    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \97    cd /polkadot-launch && \98    npm install --global yarn && \99    yarn100101COPY --from=builder /nft_parachain/target/$PROFILE/nft /unique-chain/target/$PROFILE/102COPY --from=builder-polkadot /nft_parachain/polkadot/target/$PROFILE/polkadot /polkadot/target/$PROFILE/103104CMD export NVM_DIR="$HOME/.nvm" && \105    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \106    cd /polkadot-launch && \107    yarn start launch-config.json
modifiedlaunch-config.jsondiffbeforeafterboth
--- a/launch-config.json
+++ b/launch-config.json
@@ -55,7 +55,7 @@
     },
     "parachains": [
         {
-            "bin": "../nft_private/target/release/nft",
+            "bin": "../unique-chain/target/release/nft",
             "id": "2000",
             "balance": "1000000000000000000000",
             "nodes": [