Merge branch 'develop' into feat-rollup-relayer-add-zstd-compression

2026-04-23 03:00:50 -04:00 · 2024-05-09 04:19:02 +08:00
parent 4975a078fa 612e66ebc2
commit aa01ea96fa
12 changed files with 2 additions and 2 deletions
--- a/4
+++ b/4
@@ -44,8 +44,8 @@ fmt: ## format the code

 dev_docker: ## build docker images for development/testing usages
 	docker pull postgres
-	docker build -t scroll_l1geth ./common/docker/l1geth/
-	docker build -t scroll_l2geth ./common/docker/l2geth/
+	docker build -t scroll_l1geth ./common/testcontainers/docker/l1geth/
+	docker build -t scroll_l2geth ./common/testcontainers/docker/l2geth/

 clean: ## Empty out the bin folder
 	@rm -rf build/bin
--- a/common/testcontainers/docker/interface.go
+++ b/common/testcontainers/docker/interface.go
--- a/common/testcontainers/docker/l1geth/Dockerfile
+++ b/common/testcontainers/docker/l1geth/Dockerfile
--- a/common/testcontainers/docker/l1geth/genesis-keystore
+++ b/common/testcontainers/docker/l1geth/genesis-keystore
--- a/common/testcontainers/docker/l1geth/genesis.json
+++ b/common/testcontainers/docker/l1geth/genesis.json
--- a/common/testcontainers/docker/l1geth/l1geth_run.sh
+++ b/common/testcontainers/docker/l1geth/l1geth_run.sh
--- a/common/testcontainers/docker/l1geth/password
+++ b/common/testcontainers/docker/l1geth/password
--- a/common/testcontainers/docker/l2geth/Dockerfile
+++ b/common/testcontainers/docker/l2geth/Dockerfile
--- a/common/testcontainers/docker/l2geth/genesis-keystore
+++ b/common/testcontainers/docker/l2geth/genesis-keystore
--- a/common/testcontainers/docker/l2geth/genesis.json
+++ b/common/testcontainers/docker/l2geth/genesis.json
--- a/common/testcontainers/docker/l2geth/l2geth_run.sh
+++ b/common/testcontainers/docker/l2geth/l2geth_run.sh
--- a/common/testcontainers/docker/l2geth/password
+++ b/common/testcontainers/docker/l2geth/password