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
--- a/.docker/Dockerfile-parachain
+++ b/.docker/Dockerfile-parachain
@@ -35,16 +35,16 @@
 FROM rust-builder as builder-unique
 
 ARG PROFILE=release
-ARG NETWORK=
-ARG REPO_URL=
-ARG BRANCH=
+ARG NETWORK
+ARG REPO_URL
+ARG BRANCH
 
-RUN echo "NETWORK="$NETWORK
+RUN echo "NETWORK="${NETWORK}
 
 WORKDIR /unique_parachain
 
 RUN git clone $REPO_URL -b $BRANCH . && \
-    cargo build --features="${NETWORK}-runtime" --$PROFILE
+    cargo build --features=${NETWORK}-runtime --$PROFILE
 
 # ===== RUN ======
modified.docker/Dockerfile-try-runtimediffbeforeafterboth
before · .docker/Dockerfile-try-runtime
1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=67ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN8ENV CARGO_HOME="/cargo-home"9ENV PATH="/cargo-home/bin:$PATH"10ENV TZ=UTC11RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone121314RUN apt-get update && \15    apt-get install -y curl cmake pkg-config libssl-dev git clang protobuf-compiler && \16    apt-get clean && \17    rm -r /var/lib/apt/lists/*1819RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none2021RUN 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_TOOLCHAIN2728RUN mkdir /unique_parachain29WORKDIR /unique_parachain303132# ===== BUILD ======33FROM rust-builder as builder-unique3435ARG PROFILE=release36ARG NETWORK37ARG REPLICA_FROM=38ENV NETWORK $NETWORK39ENV REPLICA_FROM $REPLICA_FROM4041COPY . /unique_parachain42WORKDIR /unique_parachain434445RUN echo "Requested features: ${NETWORK}-runtime\n" && \46    echo "Fork from: $REPLICA_FROM\n" && \47    cargo build --features=${NETWORK}-runtime --release4849CMD cargo run --features=try-runtime,${NETWORK}-runtime --release -- try-runtime --no-spec-check-panic on-runtime-upgrade live --uri $REPLICA_FROM
after · .docker/Dockerfile-try-runtime
1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN67ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN8ENV CARGO_HOME="/cargo-home"9ENV PATH="/cargo-home/bin:$PATH"10ENV TZ=UTC11RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone121314RUN apt-get update && \15    apt-get install -y curl cmake pkg-config libssl-dev git clang protobuf-compiler && \16    apt-get clean && \17    rm -r /var/lib/apt/lists/*1819RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none2021RUN 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_TOOLCHAIN2728RUN mkdir /unique_parachain29WORKDIR /unique_parachain303132# ===== BUILD ======33FROM rust-builder as builder-unique3435ARG PROFILE=release36ARG NETWORK37ARG REPLICA_FROM38ENV NETWORK $NETWORK39ENV REPLICA_FROM $REPLICA_FROM4041COPY . /unique_parachain42WORKDIR /unique_parachain434445RUN echo "Requested features: ${NETWORK}-runtime\n" && \46    echo "Fork from: $REPLICA_FROM\n" && \47    cargo build --features=${NETWORK}-runtime --release4849CMD cargo run --features=try-runtime,${NETWORK}-runtime --release -- try-runtime --no-spec-check-panic on-runtime-upgrade live --uri $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