Fix Ethereum integration test (#1175)

* Anchor Ethereum client docker image version * Fix geth CLI flags according to the set release Signed-off-by: Attila Klenik <a.klenik@gmail.com>
hyperledger · Nov 30, 2021 · 5a538e1 · 5a538e1
1 parent c73f5a7
commit 5a538e1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/packages/caliper-tests-integration/ethereum_tests/config/caliper-ethereum-clique.Dockerfile b/packages/caliper-tests-integration/ethereum_tests/config/caliper-ethereum-clique.Dockerfile
@@ -12,7 +12,7 @@
 # limitations under the License.
 #
 
-FROM ethereum/client-go:stable
+FROM ethereum/client-go:v1.10.12
 COPY ./data/ /root/
 VOLUME [ "/root/.ethereum/keystore/" ]
 RUN geth --nousb init /root/genesis.json && geth --nousb import /root/bc.dat

diff --git a/packages/caliper-tests-integration/ethereum_tests/config/docker-compose.yml b/packages/caliper-tests-integration/ethereum_tests/config/docker-compose.yml
@@ -24,4 +24,16 @@ services:
       - ./keys:/root/.ethereum/keystore
     ports:
       - 8546:8546
-    command: --unlock 0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2 --password /root/.ethereum/keystore/password --mine --minerthreads 2 --etherbase 0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2 --ws --wsaddr 0.0.0.0 --wsorigins='*' --wsapi admin,eth,miner,personal,web3 --allow-insecure-unlock --nodiscover --gasprice 1
+    command: 
+    - --unlock=0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2 
+    - --password=/root/.ethereum/keystore/password
+    - --mine 
+    - --miner.threads=2 
+    - --miner.etherbase=0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2 
+    - --miner.gasprice=1
+    - --ws 
+    - --ws.addr=0.0.0.0 
+    - --ws.origins='*' 
+    - --ws.api=admin,eth,miner,personal,web3 
+    - --allow-insecure-unlock 
+    - --nodiscover