Skip to content

Commit d744176

Browse files
authored
chore(l2): avoid CI_ETHREX_WORKDIR docker warnings (#4064)
**Motivation** Running `make down` or `make init` prints the following warnings: ``` WARN[0000] The "CI_ETHREX_WORKDIR" variable is not set. Defaulting to a blank string. WARN[0000] The "CI_ETHREX_WORKDIR" variable is not set. Defaulting to a blank string. WARN[0000] The "CI_ETHREX_WORKDIR" variable is not set. Defaulting to a blank string. WARN[0000] The "CI_ETHREX_WORKDIR" variable is not set. Defaulting to a blank string. WARN[0000] The "CI_ETHREX_WORKDIR" variable is not set. Defaulting to a blank string. WARN[0000] The "CI_ETHREX_WORKDIR" variable is not set. Defaulting to a blank string. WARN[0000] The "CI_ETHREX_WORKDIR" variable is not set. Defaulting to a blank string. WARN[0000] The "CI_ETHREX_WORKDIR" variable is not set. Defaulting to a blank string. WARN[0000] The "CI_ETHREX_WORKDIR" variable is not set. Defaulting to a blank string. WARN[0000] The "CI_ETHREX_WORKDIR" variable is not set. Defaulting to a blank string. WARN[0000] The "CI_ETHREX_WORKDIR" variable is not set. Defaulting to a blank string. WARN[0000] The "CI_ETHREX_WORKDIR" variable is not set. Defaulting to a blank string. WARN[0000] The "CI_ETHREX_WORKDIR" variable is not set. Defaulting to a blank string. WARN[0000] The "CI_ETHREX_WORKDIR" variable is not set. Defaulting to a blank string. ``` The same was happening for the `L1_RPC_URL` variable. **Description** - Sets the variables when running docker compose targets. - Renames `CI_ETHREX_WORKDIR` to `DOCKER_ETHREX_WORKDIR`. Closes #3810
1 parent d85e6d4 commit d744176

File tree

5 files changed

+34
-28
lines changed

5 files changed

+34
-28
lines changed

.github/workflows/main_prover.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ concurrency:
99
cancel-in-progress: true
1010

1111
env:
12-
CI_ETHREX_WORKDIR: /usr/local/bin
12+
DOCKER_ETHREX_WORKDIR: /usr/local/bin
1313
PROVER: sp1
1414

1515
jobs:
@@ -60,7 +60,7 @@ jobs:
6060
run: |
6161
touch cmd/.env
6262
cd crates/l2
63-
CI_ETHREX_WORKDIR=/usr/local/bin \
63+
DOCKER_ETHREX_WORKDIR=/usr/local/bin \
6464
ETHREX_DEPLOYER_DEPLOY_RICH=true \
6565
ETHREX_DEPLOYER_SP1_DEPLOY_VERIFIER=true \
6666
docker compose up --build contract_deployer
@@ -72,7 +72,7 @@ jobs:
7272
# if: ${{ always() && github.event_name == 'merge_group' }}
7373
run: |
7474
cd crates/l2
75-
CI_ETHREX_WORKDIR=/usr/local/bin \
75+
DOCKER_ETHREX_WORKDIR=/usr/local/bin \
7676
ETHREX_PROPOSER_BLOCK_TIME=12000 \
7777
ETHREX_COMMITTER_COMMIT_TIME=180000 \
7878
docker compose up --build --detach --no-deps ethrex_l2

.github/workflows/main_prover_l1.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ concurrency:
88
cancel-in-progress: true
99

1010
env:
11-
CI_ETHREX_WORKDIR: /usr/local/bin
11+
DOCKER_ETHREX_WORKDIR: /usr/local/bin
1212

1313
permissions:
1414
# deployments permission to deploy GitHub pages website

.github/workflows/pr-main_l2.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ concurrency:
1616
cancel-in-progress: true
1717

1818
env:
19-
CI_ETHREX_WORKDIR: /usr/local/bin
19+
DOCKER_ETHREX_WORKDIR: /usr/local/bin
2020

2121
jobs:
2222
lint:
@@ -143,7 +143,7 @@ jobs:
143143
run: |
144144
touch cmd/.env
145145
cd crates/l2
146-
CI_ETHREX_WORKDIR=/usr/local/bin \
146+
DOCKER_ETHREX_WORKDIR=/usr/local/bin \
147147
ETHREX_DEPLOYER_DEPLOY_RICH=true \
148148
ETHREX_DEPLOYER_PICO_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
149149
ETHREX_DEPLOYER_SP1_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
@@ -154,7 +154,7 @@ jobs:
154154
- name: Start Sequencer
155155
run: |
156156
cd crates/l2
157-
CI_ETHREX_WORKDIR=/usr/local/bin \
157+
DOCKER_ETHREX_WORKDIR=/usr/local/bin \
158158
ETHREX_L2_VALIDIUM=${{ matrix.validium }} \
159159
ETHREX_WATCHER_BLOCK_DELAY=0 \
160160
docker compose -f ${{ join(matrix.compose_targets, ' -f ') }} up --detach --no-deps ethrex_l2
@@ -205,7 +205,7 @@ jobs:
205205
run: |
206206
touch cmd/.env
207207
cd crates/l2
208-
CI_ETHREX_WORKDIR=/usr/local/bin \
208+
DOCKER_ETHREX_WORKDIR=/usr/local/bin \
209209
ETHREX_DEPLOYER_DEPLOY_RICH=true \
210210
ETHREX_DEPLOYER_PICO_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
211211
ETHREX_DEPLOYER_SP1_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
@@ -245,7 +245,7 @@ jobs:
245245
export SEQUENCER_REGISTRY
246246
cd ../crates/l2
247247
248-
CI_ETHREX_WORKDIR=/usr/local/bin \
248+
DOCKER_ETHREX_WORKDIR=/usr/local/bin \
249249
ETHREX_COMMITTER_VALIDIUM=false \
250250
ETHREX_WATCHER_BLOCK_DELAY=0 \
251251
ETHREX_BASED=true \
@@ -291,7 +291,7 @@ jobs:
291291
run: |
292292
touch cmd/.env
293293
cd crates/l2
294-
CI_ETHREX_WORKDIR=/usr/local/bin \
294+
DOCKER_ETHREX_WORKDIR=/usr/local/bin \
295295
ETHREX_DEPLOYER_DEPLOY_RICH=true \
296296
ETHREX_DEPLOYER_PICO_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \
297297
ETHREX_DEPLOYER_SP1_CONTRACT_ADDRESS=0x00000000000000000000000000000000000000aa \

crates/l2/Makefile

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ help: ## 📚 Show help for each of the Makefile recipes
1616
init: init-l1-docker deploy-l1 init-metrics init-l2 ## 🚀 Initializes a localnet with Lambda ethrex client as both L1 and L2
1717

1818
down: down-l1-docker down-l2 down-metrics ## 🛑 Shuts down the localnet
19+
@echo "✅ localnet successfully stopped"
20+
1921

2022
restart: restart-l1-docker deploy-l1 restart-metrics restart-l2 ## 🔄 Restarts the localnet
2123

@@ -30,7 +32,7 @@ ethrex_PATH=$(shell pwd)/../..
3032
ethrex_BIN_PATH=$(ethrex_PATH)/target/release/ethrex
3133
ethrex_METRICS_DOCKER_COMPOSE_PATH=$(ethrex_PATH)/metrics/docker-compose-metrics.yaml
3234
ethrex_METRICS_OVERRIDES_L2_DOCKER_COMPOSE_PATH=$(ethrex_PATH)/metrics/docker-compose-metrics-l2.overrides.yaml
33-
CI_ETHREX_WORKDIR := /usr/local/bin
35+
DOCKER_ETHREX_WORKDIR := /usr/local/bin
3436

3537
L1_RPC_URL=http://localhost:8545
3638
L1_PRIVATE_KEY=0x385c546456b6a603a1cfcaa9ec9494ba4832da08dd6bcf4de9a71e4a01b74924
@@ -57,9 +59,11 @@ PROVER_SRC_FILES := $(shell find prover/src -type f)
5759
# ==============================================================================
5860

5961
init-l1-docker: ## 🚀 Initializes an L1 Lambda ethrex Client with Docker (Used with make init)
62+
DOCKER_ETHREX_WORKDIR=${DOCKER_ETHREX_WORKDIR} \
6063
docker compose up -d ethrex_l1
6164

6265
down-l1-docker: ## 🛑 Shuts down the L1 Lambda ethrex Client
66+
DOCKER_ETHREX_WORKDIR=${DOCKER_ETHREX_WORKDIR} \
6367
docker compose down ethrex_l1
6468

6569
restart-l1-docker: down-l1-docker init-l1-docker ## 🔄 Restarts the L1 Lambda ethrex Client
@@ -139,9 +143,11 @@ init-l2-dev: ## 🚀 Initializes an L1 and L2 Lambda ethrex Client
139143
l2 --dev
140144

141145
init-metrics: ## 🚀 Initializes Grafana and Prometheus with containers
146+
L1_RPC_URL=${L1_RPC_URL} \
142147
docker compose -f ${ethrex_METRICS_DOCKER_COMPOSE_PATH} -f ${ethrex_METRICS_OVERRIDES_L2_DOCKER_COMPOSE_PATH} up -d
143148

144149
down-metrics: ## 🛑 Shuts down the metrics' containers
150+
L1_RPC_URL=${L1_RPC_URL} \
145151
docker compose -f ${ethrex_METRICS_DOCKER_COMPOSE_PATH} -f ${ethrex_METRICS_OVERRIDES_L2_DOCKER_COMPOSE_PATH} down
146152

147153
restart-metrics: down-metrics init-metrics ## 🔄 Restarts the metrics' containers
@@ -213,7 +219,7 @@ integration-test: rm-db-l2 rm-db-l1 # We create an empty .env file simply becaus
213219
# does not exist, the container fails to write to it.
214220
touch .env
215221
docker compose down
216-
CI_ETHREX_WORKDIR=${CI_ETHREX_WORKDIR} \
222+
DOCKER_ETHREX_WORKDIR=${DOCKER_ETHREX_WORKDIR} \
217223
ETHREX_L2_VALIDIUM=${ETHREX_L2_VALIDIUM} \
218224
docker compose up --detach --build
219225
RUST_LOG=info,ethrex_prover_lib=debug make init-prover & \
@@ -227,7 +233,7 @@ integration-test-gpu: rm-db-l2 rm-db-l1
227233
# does not exists, the container fails to write to it.
228234
touch .env
229235
docker compose down
230-
CI_ETHREX_WORKDIR=${CI_ETHREX_WORKDIR} \
236+
DOCKER_ETHREX_WORKDIR=${DOCKER_ETHREX_WORKDIR} \
231237
ETHREX_BLOCK_PRODUCER_BLOCK_TIME=${ETHREX_BLOCK_PRODUCER_BLOCK_TIME} \
232238
docker compose up --detach --build
233239

@@ -244,7 +250,7 @@ state-diff-test:
244250
-b ../../fixtures/blobs/ \
245251
-s $$PWD/store \
246252
-c 0x0007a881CD95B1484fca47615B64803dad620C8d
247-
CI_ETHREX_WORKDIR=${CI_ETHREX_WORKDIR} \
253+
DOCKER_ETHREX_WORKDIR=${DOCKER_ETHREX_WORKDIR} \
248254
ETHREX_WATCHER_BLOCK_DELAY=0 \
249255
docker compose -f docker-compose.yaml -f docker-compose-l2-store.overrides.yaml up --detach --no-deps ethrex_l2
250256

crates/l2/docker-compose.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,32 @@ services:
1414
image: "ethrex:unstable"
1515
build: ../../
1616
volumes:
17-
# NOTE: CI_ETHREX_WORKDIR is defined in crates/l2/Makefile
18-
- ./contracts:${CI_ETHREX_WORKDIR}/contracts
19-
- ../../cmd/.env:${CI_ETHREX_WORKDIR}/.env
20-
- ../../fixtures/genesis/l1-dev.json:${CI_ETHREX_WORKDIR}/fixtures/genesis/l1-dev.json
21-
- ../../fixtures/genesis/l2.json:${CI_ETHREX_WORKDIR}/fixtures/genesis/l2.json
22-
- ../../fixtures/keys/private_keys_l1.txt:${CI_ETHREX_WORKDIR}/fixtures/keys/private_keys_l1.txt
23-
- ./prover/zkvm/interface/sp1/out/riscv32im-succinct-zkvm-vk:${CI_ETHREX_WORKDIR}/riscv32im-succinct-zkvm-vk
24-
- ./prover/zkvm/interface/risc0/out/riscv32im-risc0-vk:${CI_ETHREX_WORKDIR}/riscv32im-risc0-vk
17+
# NOTE: DOCKER_ETHREX_WORKDIR is defined in crates/l2/Makefile
18+
- ./contracts:${DOCKER_ETHREX_WORKDIR}/contracts
19+
- ../../cmd/.env:${DOCKER_ETHREX_WORKDIR}/.env
20+
- ../../fixtures/genesis/l1-dev.json:${DOCKER_ETHREX_WORKDIR}/fixtures/genesis/l1-dev.json
21+
- ../../fixtures/genesis/l2.json:${DOCKER_ETHREX_WORKDIR}/fixtures/genesis/l2.json
22+
- ../../fixtures/keys/private_keys_l1.txt:${DOCKER_ETHREX_WORKDIR}/fixtures/keys/private_keys_l1.txt
23+
- ./prover/zkvm/interface/sp1/out/riscv32im-succinct-zkvm-vk:${DOCKER_ETHREX_WORKDIR}/riscv32im-succinct-zkvm-vk
24+
- ./prover/zkvm/interface/risc0/out/riscv32im-risc0-vk:${DOCKER_ETHREX_WORKDIR}/riscv32im-risc0-vk
2525
environment:
2626
- ETHREX_ETH_RPC_URL=http://ethrex_l1:8545
2727
# NOTE: The paths in the env variables must match those
2828
# specified in the `volumes:` section
2929
- ETHREX_DEPLOYER_L1_PRIVATE_KEY=${ETHREX_DEPLOYER_PRIVATE_KEY:-0x385c546456b6a603a1cfcaa9ec9494ba4832da08dd6bcf4de9a71e4a01b74924}
30-
- ETHREX_DEPLOYER_ENV_FILE_PATH=${CI_ETHREX_WORKDIR}/.env
31-
- ETHREX_DEPLOYER_GENESIS_L1_PATH=${CI_ETHREX_WORKDIR}/fixtures/genesis/l1-dev.json
32-
- ETHREX_DEPLOYER_GENESIS_L2_PATH=${CI_ETHREX_WORKDIR}/fixtures/genesis/l2.json
33-
- ETHREX_DEPLOYER_PRIVATE_KEYS_FILE_PATH=${CI_ETHREX_WORKDIR}/fixtures/keys/private_keys_l1.txt
30+
- ETHREX_DEPLOYER_ENV_FILE_PATH=${DOCKER_ETHREX_WORKDIR}/.env
31+
- ETHREX_DEPLOYER_GENESIS_L1_PATH=${DOCKER_ETHREX_WORKDIR}/fixtures/genesis/l1-dev.json
32+
- ETHREX_DEPLOYER_GENESIS_L2_PATH=${DOCKER_ETHREX_WORKDIR}/fixtures/genesis/l2.json
33+
- ETHREX_DEPLOYER_PRIVATE_KEYS_FILE_PATH=${DOCKER_ETHREX_WORKDIR}/fixtures/keys/private_keys_l1.txt
3434
- ETHREX_DEPLOYER_DEPLOY_RICH=${ETHREX_DEPLOYER_DEPLOY_RICH:-true}
3535
- ETHREX_DEPLOYER_PICO_CONTRACT_VERIFIER=${ETHREX_DEPLOYER_PICO_CONTRACT_VERIFIER:-0x00000000000000000000000000000000000000aa}
3636
- ETHREX_DEPLOYER_PICO_DEPLOY_VERIFIER=${ETHREX_DEPLOYER_PICO_DEPLOY_VERIFIER:-false}
3737
- ETHREX_DEPLOYER_RISC0_CONTRACT_VERIFIER=${ETHREX_DEPLOYER_RISC0_CONTRACT_VERIFIER:-0x00000000000000000000000000000000000000aa}
3838
- ETHREX_DEPLOYER_SP1_CONTRACT_VERIFIER=${ETHREX_DEPLOYER_SP1_CONTRACT_VERIFIER:-0x00000000000000000000000000000000000000aa}
3939
- ETHREX_DEPLOYER_SP1_DEPLOY_VERIFIER=${ETHREX_DEPLOYER_SP1_DEPLOY_VERIFIER:-false}
4040
- ETHREX_DEPLOYER_ALIGNED_AGGREGATOR_ADDRESS=${ETHREX_DEPLOYER_ALIGNED_AGGREGATOR_ADDRESS:-0x00000000000000000000000000000000000000aa}
41-
- ETHREX_SP1_VERIFICATION_KEY_PATH=${CI_ETHREX_WORKDIR}/riscv32im-succinct-zkvm-vk
42-
- ETHREX_RISC0_VERIFICATION_KEY_PATH=${CI_ETHREX_WORKDIR}/riscv32im-risc0-vk
41+
- ETHREX_SP1_VERIFICATION_KEY_PATH=${DOCKER_ETHREX_WORKDIR}/riscv32im-succinct-zkvm-vk
42+
- ETHREX_RISC0_VERIFICATION_KEY_PATH=${DOCKER_ETHREX_WORKDIR}/riscv32im-risc0-vk
4343
- ETHREX_DEPLOYER_TDX_CONTRACT_VERIFIER=${ETHREX_DEPLOYER_TDX_CONTRACT_VERIFIER:-0x00000000000000000000000000000000000000aa}
4444
- ETHREX_DEPLOYER_TDX_DEPLOY_VERIFIER=${ETHREX_DEPLOYER_TDX_DEPLOY_VERIFIER:-false}
4545
- ETHREX_TDX_DEV_MODE=${ETHREX_TDX_DEV_MODE:-false}

0 commit comments

Comments
 (0)