git.delta.rocks / unique-network / refs/commits / 41613d6a6f37

difftreelog

merge override docker-compose files

Konstantin Astakhov2022-11-01parent: #8a0d4a7.patch.diff
in: master

12 files changed

deleted.docker/docker-compose-dev.yamldiffbeforeafterboth

no changes

deleted.docker/docker-compose-forkless.ymldiffbeforeafterboth

no changes

deleted.docker/docker-compose-master.ymldiffbeforeafterboth

no changes

deleted.docker/docker-compose-try-runtime.ymldiffbeforeafterboth

no changes

modified.docker/docker-compose.tmp-dev.j2diffbeforeafterboth
8 - "NETWORK={{ NETWORK }}"8 - "NETWORK={{ NETWORK }}"
9 context: ../9 context: ../
10 dockerfile: .docker/Dockerfile-chain-dev10 dockerfile: .docker/Dockerfile-chain-dev
11 image: node-dev
12 container_name: node-dev
11 expose:13 expose:
12 - 994414 - 9944
13 - 993315 - 9933
deleted.docker/docker-compose.tmp-master.j2diffbeforeafterboth

no changes

added.docker/docker-compose.tmp-try-runtime.j2diffbeforeafterboth

no changes

modified.docker/docker-compose.tmp-unit.j2diffbeforeafterboth
8 args:8 args:
9 - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"9 - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
10 - "NETWORK={{ NETWORK }}"10 - "NETWORK={{ NETWORK }}"
11 image: node-dev
12 container_name: node-dev
11 logging:13 logging:
12 options:14 options:
13 max-size: "1m"15 max-size: "1m"
deleted.docker/docker-compose.try-runtime.j2diffbeforeafterboth

no changes

modified.github/workflows/try-runtime.ymldiffbeforeafterboth
41 - name: Generate ENV related extend file for docker-compose41 - name: Generate ENV related extend file for docker-compose
42 uses: cuchi/jinja2-action@v1.2.042 uses: cuchi/jinja2-action@v1.2.0
43 with:43 with:
44 template: .docker/docker-compose.try-runtime.j244 template: .docker/docker-compose.tmp-try-runtime.j2
45 output_file: .docker/docker-compose.try-runtime.${{ matrix.network }}.yml45 output_file: .docker/docker-compose.try-runtime.${{ matrix.network }}.yml
46 variables: |46 variables: |
47 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}47 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
modified.github/workflows/unit-test.ymldiffbeforeafterboth
46 run: cat .docker/docker-compose.unit.yml46 run: cat .docker/docker-compose.unit.yml
4747
48 - name: Build the stack48 - name: Build the stack
49 run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.unit.yml" up --build --force-recreate --timeout 300 --remove-orphans --exit-code-from node-dev49 run: docker-compose -f ".docker/docker-compose.unit.yml" up --build --force-recreate --timeout 300 --remove-orphans --exit-code-from node-dev
5050
51 - name: Stop running containers51 - name: Stop running containers
52 if: always() # run this step always52 if: always() # run this step always
53 run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.unit.yml" down53 run: docker-compose -f ".docker/docker-compose.unit.yml" down
54 54
55 - name: Remove builder cache55 - name: Remove builder cache
56 if: always() # run this step always56 if: always() # run this step always
modified.github/workflows/yarn-dev.ymldiffbeforeafterboth
54 run: cat .docker/docker-compose.${{ matrix.network }}.yml54 run: cat .docker/docker-compose.${{ matrix.network }}.yml
5555
56 - name: Build the stack56 - name: Build the stack
57 run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build --remove-orphans57 run: docker-compose -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build --remove-orphans
5858
59 - uses: actions/setup-node@v359 - uses: actions/setup-node@v3
60 with:60 with:
8888
89 - name: Stop running containers89 - name: Stop running containers
90 if: always() # run this step always90 if: always() # run this step always
91 run: docker-compose -f ".docker/docker-compose-dev.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" down91 run: docker-compose -f ".docker/docker-compose.${{ matrix.network }}.yml" down
9292
93 - name: Remove builder cache93 - name: Remove builder cache
94 if: always() # run this step always94 if: always() # run this step always