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
35FROM rust-builder as builder-unique35FROM rust-builder as builder-unique
3636
37ARG PROFILE=release37ARG PROFILE=release
38ARG NETWORK=38ARG NETWORK
39ARG REPO_URL=39ARG REPO_URL
40ARG BRANCH=40ARG BRANCH
4141
42RUN echo "NETWORK="$NETWORK42RUN echo "NETWORK="${NETWORK}
4343
44WORKDIR /unique_parachain44WORKDIR /unique_parachain
4545
46RUN git clone $REPO_URL -b $BRANCH . && \46RUN git clone $REPO_URL -b $BRANCH . && \
47    cargo build --features="${NETWORK}-runtime" --$PROFILE47    cargo build --features=${NETWORK}-runtime --$PROFILE
4848
49# ===== RUN ======49# ===== RUN ======
5050
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