git.delta.rocks / unique-network / refs/commits / 4ed64c2572b0

difftreelog

merge try-tuntime compose files

Konstantin Astakhov2022-10-31parent: #04e0d10.patch.diff
in: master

4 files changed

modified.docker/Dockerfile-parachaindiffbeforeafterboth
before · .docker/Dockerfile-parachain
1ARG POLKADOT_BUILD_BRANCH2FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot34# ===== Rust builder =====5FROM ubuntu:20.04 as rust-builder6LABEL maintainer="Unique.Network"78ARG RUST_TOOLCHAIN=9ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN1011ENV CARGO_HOME="/cargo-home"12ENV PATH="/cargo-home/bin:$PATH"13ENV TZ=UTC14RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1516RUN apt-get update && \17    apt-get install -y curl cmake pkg-config libssl-dev git clang protobuf-compiler && \18    apt-get clean && \19    rm -r /var/lib/apt/lists/*2021RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none2223RUN rustup toolchain uninstall $(rustup toolchain list) && \24    rustup toolchain install $RUST_TOOLCHAIN && \25    rustup default $RUST_TOOLCHAIN && \26    rustup target list --installed && \27    rustup show28RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN2930RUN mkdir /unique_parachain31WORKDIR /unique_parachain323334# ===== BUILD ======35FROM rust-builder as builder-unique3637ARG PROFILE=release38ARG NETWORK=39ARG REPO_URL=40ARG BRANCH=4142RUN echo "NETWORK="$NETWORK4344WORKDIR /unique_parachain4546RUN git clone $REPO_URL -b $BRANCH . && \47    cargo build --features="${NETWORK}-runtime" --$PROFILE4849# ===== RUN ======5051FROM ubuntu:20.045253ARG POLKADOT_LAUNCH_BRANCH=5455RUN apt-get -y update && \56      apt-get -y install curl git && \57      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \58      export NVM_DIR="$HOME/.nvm" && \59      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \60      nvm install v16.16.0 && \61      nvm use v16.16.06263RUN git clone https://github.com/uniquenetwork/polkadot-launch -b ${POLKADOT_LAUNCH_BRANCH}6465RUN export NVM_DIR="$HOME/.nvm" && \66    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \67    cd /polkadot-launch && \68    npm install --global yarn && \69    yarn install7071COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/72COPY --from=builder-unique /unique_parachain/launch-config.json /polkadot-launch/launch-config.json7374COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/7576CMD export NVM_DIR="$HOME/.nvm" && \77    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \78    cd /polkadot-launch && \79    yarn start launch-config.json
after · .docker/Dockerfile-parachain
1ARG POLKADOT_BUILD_BRANCH2FROM uniquenetwork/builder-polkadot:${POLKADOT_BUILD_BRANCH} as polkadot34# ===== Rust builder =====5FROM ubuntu:20.04 as rust-builder6LABEL maintainer="Unique.Network"78ARG RUST_TOOLCHAIN=9ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN1011ENV CARGO_HOME="/cargo-home"12ENV PATH="/cargo-home/bin:$PATH"13ENV TZ=UTC14RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1516RUN apt-get update && \17    apt-get install -y curl cmake pkg-config libssl-dev git clang protobuf-compiler && \18    apt-get clean && \19    rm -r /var/lib/apt/lists/*2021RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none2223RUN rustup toolchain uninstall $(rustup toolchain list) && \24    rustup toolchain install $RUST_TOOLCHAIN && \25    rustup default $RUST_TOOLCHAIN && \26    rustup target list --installed && \27    rustup show28RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN2930RUN mkdir /unique_parachain31WORKDIR /unique_parachain323334# ===== BUILD ======35FROM rust-builder as builder-unique3637ARG PROFILE=release38ARG NETWORK39ARG REPO_URL40ARG BRANCH4142RUN echo "NETWORK="${NETWORK}4344WORKDIR /unique_parachain4546RUN git clone $REPO_URL -b $BRANCH . && \47    cargo build --features=${NETWORK}-runtime --$PROFILE4849# ===== RUN ======5051FROM ubuntu:20.045253ARG POLKADOT_LAUNCH_BRANCH=5455RUN apt-get -y update && \56      apt-get -y install curl git && \57      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \58      export NVM_DIR="$HOME/.nvm" && \59      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \60      nvm install v16.16.0 && \61      nvm use v16.16.06263RUN git clone https://github.com/uniquenetwork/polkadot-launch -b ${POLKADOT_LAUNCH_BRANCH}6465RUN export NVM_DIR="$HOME/.nvm" && \66    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \67    cd /polkadot-launch && \68    npm install --global yarn && \69    yarn install7071COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/72COPY --from=builder-unique /unique_parachain/launch-config.json /polkadot-launch/launch-config.json7374COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/7576CMD export NVM_DIR="$HOME/.nvm" && \77    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \78    cd /polkadot-launch && \79    yarn start launch-config.json
modified.docker/Dockerfile-try-runtimediffbeforeafterboth
--- a/.docker/Dockerfile-try-runtime
+++ b/.docker/Dockerfile-try-runtime
@@ -2,7 +2,7 @@
 FROM ubuntu:20.04 as rust-builder
 LABEL maintainer="Unique.Network"
 
-ARG RUST_TOOLCHAIN=
+ARG RUST_TOOLCHAIN
 
 ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
 ENV CARGO_HOME="/cargo-home"
@@ -34,7 +34,7 @@
 
 ARG PROFILE=release
 ARG NETWORK
-ARG REPLICA_FROM=
+ARG REPLICA_FROM
 ENV NETWORK $NETWORK
 ENV REPLICA_FROM $REPLICA_FROM
modified.docker/docker-compose.try-runtime.j2diffbeforeafterboth
--- a/.docker/docker-compose.try-runtime.j2
+++ b/.docker/docker-compose.try-runtime.j2
@@ -3,8 +3,21 @@
 services:
   try-runtime:
     build:
+      context: ../
+      dockerfile: .docker/Dockerfile-try-runtime
       args:
         - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
         - "NETWORK={{ NETWORK }}"
-        - "REPLICA_FROM={{ REPLICA_FROM }}"
-
+        - "REPLICA_FROM={{ REPLICA_FROM }}"      
+    image: try-runtime
+    container_name: try-runtime
+    expose:
+      - 9944
+      - 9933
+    ports:
+      - 127.0.0.1:9944:9944
+      - 127.0.0.1:9933:9933
+    logging:
+      options:
+        max-size: "1m"
+        max-file: "3"
modified.github/workflows/try-runtime.ymldiffbeforeafterboth
--- a/.github/workflows/try-runtime.yml
+++ b/.github/workflows/try-runtime.yml
@@ -52,7 +52,7 @@
         run: cat .docker/docker-compose.try-runtime.${{ matrix.network }}.yml
 
       - name: Build the stack
-        run: docker-compose -f ".docker/docker-compose-try-runtime.yml" -f ".docker/docker-compose.try-runtime.${{ matrix.network }}.yml" up --build  --force-recreate --timeout 300 --remove-orphans --exit-code-from try-runtime
+        run: docker-compose -f ".docker/docker-compose.try-runtime.${{ matrix.network }}.yml" up --build  --force-recreate --timeout 300 --remove-orphans --exit-code-from try-runtime
  
       - name: Collect Docker Logs
         if: success() || failure()
@@ -66,7 +66,7 @@
 
       - name: Stop running containers
         if: always()                   # run this step always
-        run: docker-compose -f ".docker/docker-compose-try-runtime.yml" -f ".docker/docker-compose.try-runtime.${{ matrix.network }}.yml" down
+        run: docker-compose -f ".docker/docker-compose.try-runtime.${{ matrix.network }}.yml" down
         
       - name: Remove builder cache
         if: always()                   # run this step always