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

difftreelog

fix Added additional Jinja2 template.

Alexander Aksenov2022-08-02parent: #2f394b0.patch.diff
in: master

3 files changed

added.docker/docker-compose.tmp-master.j2diffbeforeafterboth
--- /dev/null
+++ b/.docker/docker-compose.tmp-master.j2
@@ -0,0 +1,10 @@
+version: "3.5"
+
+services:
+  blockchain_nodes:
+    build:
+      args:
+        - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
+        - "BRANCH={{ BRANCH }}"
+        - "REPO_URL={{ REPO_URL }}"
+        - "FEATURE={{ FEATURE }}"
modified.docker/docker-compose.tmp.j2diffbeforeafterboth
8 - "BRANCH={{ BRANCH }}"8 - "BRANCH={{ BRANCH }}"
9 - "REPO_URL={{ REPO_URL }}"9 - "REPO_URL={{ REPO_URL }}"
10 - "FEATURE={{ FEATURE }}"10 - "FEATURE={{ FEATURE }}"
11
12 command: cargo run --release $FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
1113
modified.github/workflows/build-test-master.ymldiffbeforeafterboth
--- a/.github/workflows/build-test-master.yml
+++ b/.github/workflows/build-test-master.yml
@@ -72,7 +72,7 @@
       - name: Generate ENV related extend file for docker-compose
         uses: cuchi/jinja2-action@v1.2.0
         with:
-          template: .docker/docker-compose.tmp.j2
+          template: .docker/docker-compose.tmp-master.j2
           output_file: .docker/docker-compose.${{ matrix.network }}.yml
           variables: |
             REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
@@ -84,7 +84,7 @@
         run: cat .docker/docker-compose.${{ matrix.network }}.yml
 
       - name: Build the stack
-        run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build
+        run: docker-compose -f ".docker/docker-compose-tests-parachain.yml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build
 
 #      - name: "Build the Docker image with Feature: ${{ env.features }}"
 #        run: docker build -t build-${{ github.head_ref }} --file .docker/Dockerfile-chain-dev --build-arg REPO_URL=${{ github.server_url }}/${{ github.repository }}.git --build-arg RUST_TOOLCHAIN=${{ env.actual_toolchain }} --build-arg FEATURE="${{ env.features }}" --build-arg BRANCH=${{ github.head_ref }} --no-cache .