Skip to content

Commit cb60fa6

Browse files
committed
use common volume
1 parent 921b241 commit cb60fa6

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

crates/l2/docker-compose.yaml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
volumes:
2+
env:
3+
14
services:
25
ethrex_l1:
36
container_name: ethrex_l1
@@ -16,7 +19,8 @@ services:
1619
volumes:
1720
# NOTE: DOCKER_ETHREX_WORKDIR is defined in crates/l2/Makefile
1821
- ./contracts:${DOCKER_ETHREX_WORKDIR}/contracts
19-
- ../../cmd/.env:${DOCKER_ETHREX_WORKDIR}/.env
22+
# - ../../cmd/.env:${DOCKER_ETHREX_WORKDIR}/.env
23+
- env:/env/
2024
- ../../fixtures/genesis/l1-dev.json:${DOCKER_ETHREX_WORKDIR}/fixtures/genesis/l1-dev.json
2125
- ../../fixtures/genesis/l2.json:${DOCKER_ETHREX_WORKDIR}/fixtures/genesis/l2.json
2226
- ../../fixtures/keys/private_keys_l1.txt:${DOCKER_ETHREX_WORKDIR}/fixtures/keys/private_keys_l1.txt
@@ -27,7 +31,7 @@ services:
2731
# NOTE: The paths in the env variables must match those
2832
# specified in the `volumes:` section
2933
- ETHREX_DEPLOYER_L1_PRIVATE_KEY=${ETHREX_DEPLOYER_PRIVATE_KEY:-0x385c546456b6a603a1cfcaa9ec9494ba4832da08dd6bcf4de9a71e4a01b74924}
30-
- ETHREX_DEPLOYER_ENV_FILE_PATH=${DOCKER_ETHREX_WORKDIR}/.env
34+
- ETHREX_DEPLOYER_ENV_FILE_PATH=/env/.env
3135
- ETHREX_DEPLOYER_GENESIS_L1_PATH=${DOCKER_ETHREX_WORKDIR}/fixtures/genesis/l1-dev.json
3236
- ETHREX_DEPLOYER_GENESIS_L2_PATH=${DOCKER_ETHREX_WORKDIR}/fixtures/genesis/l2.json
3337
- ETHREX_DEPLOYER_PRIVATE_KEYS_FILE_PATH=${DOCKER_ETHREX_WORKDIR}/fixtures/keys/private_keys_l1.txt
@@ -51,6 +55,10 @@ services:
5155
- COMPILE_CONTRACTS=true
5256
depends_on:
5357
- ethrex_l1
58+
entrypoint:
59+
- /bin/bash
60+
- -c
61+
- touch /env/.env; exec ./ethrex "$0" "$@"
5462
command: >
5563
l2
5664
deploy
@@ -76,15 +84,16 @@ services:
7684
- ETHREX_STATE_UPDATER_SEQUENCER_REGISTRY=${ETHREX_STATE_UPDATER_SEQUENCER_REGISTRY:-0x0000000000000000000000000000000000000000}
7785
- ETHREX_COMMITTER_COMMIT_TIME=${ETHREX_COMMITTER_COMMIT_TIME:-60000}
7886
- ETHREX_WATCHER_WATCH_INTERVAL=${ETHREX_WATCHER_WATCH_INTERVAL:-12000}
79-
env_file:
80-
- ../../cmd/.env
87+
# env_file:
88+
# - ../../cmd/.env
8189
volumes:
8290
- ../../fixtures/genesis/l2.json:/genesis/l2.json
83-
- ../../cmd/.env:/.env:ro
91+
- env:/env/
92+
# - ../../cmd/.env:/.env:ro
8493
entrypoint:
8594
- /bin/bash
8695
- -c
87-
- export $$(xargs < /.env); exec ./ethrex "$$0" "$$@"
96+
- export $$(xargs < /env/.env); exec ./ethrex "$$0" "$$@"
8897
# ETHREX_WATCHER_BRIDGE_ADDRESS and ETHREX_COMMITTER_ON_CHAIN_PROPOSER_ADDRESS are set in the .env file by the contract_deployer service.
8998
command: >
9099
l2

0 commit comments

Comments
 (0)