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
--- 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
3services:3services:
4 try-runtime:4 try-runtime:
5 build:5 build:
6 context: ../
7 dockerfile: .docker/Dockerfile-try-runtime
6 args:8 args:
7 - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"9 - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
8 - "NETWORK={{ NETWORK }}"10 - "NETWORK={{ NETWORK }}"
9 - "REPLICA_FROM={{ REPLICA_FROM }}"11 - "REPLICA_FROM={{ REPLICA_FROM }}"
12 image: try-runtime
13 container_name: try-runtime
14 expose:
15 - 9944
16 - 9933
17 ports:
18 - 127.0.0.1:9944:9944
19 - 127.0.0.1:9933:9933
20 logging:
21 options:
22 max-size: "1m"
23 max-file: "3"
1024
11
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