-
Notifications
You must be signed in to change notification settings - Fork 59
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add docker-compose for
test_docker_compose_release (#1777)
- Loading branch information
Showing
6 changed files
with
132 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| version: "2.3" | ||
| services: | ||
| geth: | ||
| entrypoint: ["echo", "clique geth is disabled for reorgs"] | ||
|
|
||
| geth-1: | ||
| image: ethereum/client-go:v1.9.12 | ||
| container_name: geth-1 | ||
| environment: | ||
| - ACCOUNT=0x6de4b3b9c28e9c3e84c2b2d3a875c947a84de68d | ||
| - BOOTNODES=enode://b655cc3e5b72ab9beb8a8536a3c3ae92fbeb79feb1ebd7f95d72be72554ca586428bd48a54eb9c2bcaae455cc674299b6dd3df3c6556a493dfd50070f1a448aa@172.27.0.202:30303 | ||
| - INIT=false | ||
| entrypoint: /bin/sh -c ". data/geth/command" | ||
| expose: | ||
| - 8545 | ||
| - 8546 | ||
| - 30303 | ||
| ports: | ||
| - 9000:8545 | ||
| volumes: | ||
| - ./data1:/data | ||
| - ./data/ethash:/root/.ethash | ||
| healthcheck: | ||
| test: curl geth-1:8545 | ||
| interval: 5s | ||
| timeout: 3s | ||
| retries: 5 | ||
| networks: | ||
| chain_net: | ||
| ipv4_address: 172.27.0.201 | ||
|
|
||
| geth-2: | ||
| image: ethereum/client-go:v1.9.12 | ||
| container_name: geth-2 | ||
| depends_on: | ||
| - geth-1 | ||
| environment: | ||
| - ACCOUNT=0xc0f780dfc35075979b0def588d999225b7ecc56f | ||
| - BOOTNODES=enode://4574f825d67bf570b9216e704a5b761d05d5015c458e2c9dd4b30abb2fe8c881400c2074a126df94690c4c9fb72ee046e6e3ac2bb73dede42fce66cb0a963b36@172.27.0.201:30303 | ||
| - INIT=false | ||
| entrypoint: /bin/sh -c ". data/geth/command" | ||
| expose: | ||
| - 8546 | ||
| - 8545 | ||
| - 30303 | ||
| ports: | ||
| - 9001:8545 | ||
| volumes: | ||
| - ./data2:/data | ||
| - ./data/ethash:/root/.ethash | ||
| healthcheck: | ||
| test: curl geth-2:8545 | ||
| interval: 5s | ||
| timeout: 3s | ||
| retries: 5 | ||
| networks: | ||
| chain_net: | ||
| ipv4_address: 172.27.0.202 | ||
|
|
||
| nginx: | ||
| depends_on: | ||
| geth-1: | ||
| condition: service_healthy | ||
| geth-2: | ||
| condition: service_healthy | ||
| volumes: | ||
| - ./nginx.reorg.conf:/etc/nginx/nginx.conf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| # this is an override to our usual docker-compose.yml which enables cabbage integration tests to run against a | ||
| # test-friendly setup of our services | ||
| version: "2.3" | ||
| services: | ||
| watcher: | ||
| environment: | ||
| - EXIT_PROCESSOR_SLA_MARGIN=30 | ||
| watcher_info: | ||
| environment: | ||
| - EXIT_PROCESSOR_SLA_MARGIN=30 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| events {} | ||
| http { | ||
| upstream geth { | ||
| server 172.27.0.201:8545; | ||
| server 172.27.0.202:8545; | ||
| } | ||
|
|
||
| upstream websocket { | ||
| server 172.27.0.201:8546; | ||
| server 172.27.0.202:8546; | ||
| } | ||
|
|
||
| server { | ||
| listen 80; | ||
|
|
||
| location / { | ||
| proxy_pass http://geth; | ||
| proxy_next_upstream non_idempotent invalid_header error timeout http_500 http_502 http_504 http_403 http_404; | ||
| proxy_next_upstream_tries 4; | ||
| fastcgi_read_timeout 10; | ||
| proxy_read_timeout 10; | ||
| } | ||
| } | ||
|
|
||
| server { | ||
| listen 81; | ||
|
|
||
| location / { | ||
| proxy_pass http://websocket; | ||
| proxy_http_version 1.1; | ||
| proxy_set_header Upgrade $http_upgrade; | ||
| proxy_set_header Connection "upgrade"; | ||
| proxy_next_upstream non_idempotent invalid_header error timeout http_500 http_502 http_504 http_403 http_404; | ||
| proxy_connect_timeout 7d; | ||
| proxy_send_timeout 7d; | ||
| proxy_read_timeout 7d; | ||
| } | ||
| } | ||
| } |
Submodule cabbage
updated
16 files
| +64 −0 | .circleci/config.yml | |
| +190 −0 | LICENSE | |
| +15 −30 | Makefile | |
| +2 −3 | README.md | |
| +2 −2 | apps/itest/lib/plasma_framework.ex | |
| +5 −1 | apps/itest/lib/poller.ex | |
| +31 −5 | apps/itest/lib/standard_exit_client.ex | |
| +5 −1 | apps/itest/test/itest/configuration_api_test.exs | |
| +42 −6 | apps/itest/test/itest/in_flight_exits_test.exs | |
| +7 −1 | apps/itest/test/test_helper.exs | |
| +0 −69 | docker-compose-2-reorg.yml | |
| +0 −10 | docker-compose-2-specs.yml | |
| +0 −66 | docker-compose-reorg.yml | |
| +0 −10 | docker-compose-specs.yml | |
| +0 −9 | localchain_contract_addresses.env | |
| +0 −39 | nginx.conf |