Skip to content

Commit d66b0e4

Browse files
committed
Fix docker-compose
1 parent 22e8a45 commit d66b0e4

File tree

3 files changed

+22
-16
lines changed

3 files changed

+22
-16
lines changed

.github/workflows/espresso-devnet-tests.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
test:
1414
runs-on: ubuntu-24.04-8core
1515
env:
16-
ESPRESSO_DEVNET_TESTS_LIVENESS_PERIOD: '1m'
17-
ESPRESSO_DEVNET_TESTS_OUTAGE_PERIOD: '1m'
16+
ESPRESSO_DEVNET_TESTS_LIVENESS_PERIOD: "1m"
17+
ESPRESSO_DEVNET_TESTS_OUTAGE_PERIOD: "1m"
1818
steps:
1919
- name: Checkout repository
2020
uses: actions/checkout@v4
2121
with:
22-
submodules: 'recursive'
22+
submodules: "recursive"
2323

2424
- name: Install Nix
2525
uses: nixbuild/nix-quick-install-action@v30
@@ -50,8 +50,8 @@ jobs:
5050
./scripts/prepare-allocs.sh
5151
docker compose build
5252
53-
# - name: Run Devnet tests
54-
# run: go test -timeout 30m -p 1 -count 1 -v ./espresso/devnet-tests/...
53+
- name: Run Devnet tests
54+
run: go test -timeout 30m -p 1 -count 1 -v ./espresso/devnet-tests/...
5555

5656
- name: Save Nix cache
5757
uses: nix-community/cache-nix-action/save@v6

espresso/.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ OPERATOR_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf
3434
# cast wallet address --private-key $OPERATOR_PRIVATE_KEY
3535
OPERATOR_ADDRESS=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
3636

37+
OP_BATCHER_PRIVATE_KEY=OPERATOR_PRIVATE_KEY
38+
3739
# cast wallet address --mnemonic "test test ... junk" --hd-path "m/44'/60'/0'/0/1"
3840
PROPOSER_ADDRESS=0x70997970C51812dc3A010C7d01b50e0d17dc79C8
3941

espresso/docker-compose.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ services:
8080
l1-genesis:
8181
condition: service_completed_successfully
8282
healthcheck:
83-
test: [ "CMD", "curl", "-f", "http://localhost:${L1_HTTP_PORT}" ]
83+
test: ["CMD", "curl", "-f", "http://localhost:${L1_HTTP_PORT}"]
8484
interval: 3s
8585
timeout: 2s
8686
retries: 40
@@ -172,7 +172,7 @@ services:
172172
dockerfile: espresso/docker/op-stack/Dockerfile
173173
target: op-node-target
174174
healthcheck:
175-
test: [ "CMD", "curl", "-f", "http://localhost:${ROLLUP_PORT}" ]
175+
test: ["CMD", "curl", "-f", "http://localhost:${ROLLUP_PORT}"]
176176
interval: 3s
177177
timeout: 2s
178178
retries: 40
@@ -213,7 +213,7 @@ services:
213213
dockerfile: espresso/docker/op-stack/Dockerfile
214214
target: op-node-target
215215
healthcheck:
216-
test: [ "CMD", "curl", "-f", "http://localhost:${VERIFIER_PORT}" ]
216+
test: ["CMD", "curl", "-f", "http://localhost:${VERIFIER_PORT}"]
217217
interval: 3s
218218
timeout: 2s
219219
retries: 40
@@ -250,7 +250,7 @@ services:
250250
dockerfile: espresso/docker/op-stack/Dockerfile
251251
target: op-node-target
252252
healthcheck:
253-
test: [ "CMD", "curl", "-f", "http://localhost:${CAFF_PORT}" ]
253+
test: ["CMD", "curl", "-f", "http://localhost:${CAFF_PORT}"]
254254
interval: 3s
255255
timeout: 2s
256256
retries: 40
@@ -295,7 +295,7 @@ services:
295295
restart: "no"
296296

297297
op-batcher:
298-
profiles: [ "default" ]
298+
profiles: ["default"]
299299
build:
300300
context: ../
301301
dockerfile: espresso/docker/op-stack/Dockerfile
@@ -325,7 +325,7 @@ services:
325325
- op-batcher
326326
- --espresso-light-client-addr=0x703848f4c85f18e3acd8196c8ec91eb0b7bd0797
327327
- --testing-espresso-batcher-private-key=${OP_TESTING_BATCHER_PRIVATE_KEY:-$OPERATOR_PRIVATE_KEY}
328-
- --private-key=${OP_BATCHER_PRIVATE_KEY:-$OPERATOR_PRIVATE_KEY}
328+
- --private-key=${OP_BATCHER_PRIVATE_KEY:-$OP_BATCHER_PRIVATE_KEY}
329329
- --throttle-threshold=0
330330
- --max-channel-duration=2
331331
- --target-num-frames=1
@@ -346,14 +346,18 @@ services:
346346
- proxy
347347

348348
op-batcher-tee:
349-
profiles: [ "tee" ]
349+
profiles: ["tee"]
350350
build:
351351
context: ../
352352
dockerfile: espresso/docker/op-stack/Dockerfile
353353
target: op-batcher-enclave-target
354354
image: op-batcher-tee:espresso
355355
healthcheck:
356-
test: [ "CMD-SHELL", "test -f /tmp/enclave-tools.pid && kill -0 $(cat /tmp/enclave-tools.pid) 2>/dev/null || exit 1" ]
356+
test:
357+
[
358+
"CMD-SHELL",
359+
"test -f /tmp/enclave-tools.pid && kill -0 $(cat /tmp/enclave-tools.pid) 2>/dev/null || exit 1",
360+
]
357361
interval: 30s
358362
timeout: 10s
359363
retries: 3
@@ -401,7 +405,7 @@ services:
401405
/source/espresso/docker/op-batcher-tee/run-enclave.sh
402406
403407
op-proposer:
404-
profiles: [ "default" ]
408+
profiles: ["default"]
405409
build:
406410
context: ../
407411
dockerfile: espresso/docker/op-stack/Dockerfile
@@ -423,10 +427,10 @@ services:
423427
OP_PROPOSER_PROPOSAL_INTERVAL: 6s
424428
OP_PROPOSER_MNEMONIC: "test test test test test test test test test test test junk"
425429
OP_PROPOSER_HD_PATH: "m/44'/60'/0'/0/1"
426-
OP_PROPOSER_GAME_TYPE: '1'
430+
OP_PROPOSER_GAME_TYPE: "1"
427431

428432
op-challenger:
429-
profiles: [ "default" ]
433+
profiles: ["default"]
430434
build:
431435
context: ../
432436
dockerfile: espresso/docker/op-stack/Dockerfile

0 commit comments

Comments
 (0)