Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update agg latest docker image #231

Draft
wants to merge 1 commit into
base: dev
Choose a base branch
from
+3 −40
Draft

Update agg latest docker image #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions test/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ DOCKER_COMPOSE := docker compose -f docker-compose.yml
DOCKER_STATELESS_EXECUTOR := xlayer-executor
DOCKER_SEQ_SENDER := xlayer-seqs
DOCKER_AGGREGATOR := xlayer-agg
DOCKER_AGGREGATOR_DB := xlayer-agg-db
DOCKER_BRIDGE_DB := xlayer-bridge-db
DOCKER_BRIDGE_REDIS := xlayer-bridge-redis
DOCKER_BRIDGE_ZOOKEEPER := kafka-zookeeper
Expand All @@ -26,7 +25,6 @@ DOCKER_GRAFANA := grafana
RUN_DOCKER_STATELESS_EXECUTOR := $(DOCKER_COMPOSE) up -d $(DOCKER_STATELESS_EXECUTOR)
RUN_DOCKER_SEQ_SENDER := $(DOCKER_COMPOSE) up -d $(DOCKER_SEQ_SENDER)
RUN_DOCKER_AGGREGATOR := $(DOCKER_COMPOSE) up -d $(DOCKER_AGGREGATOR)
RUN_DOCKER_AGGREGATOR_DB := $(DOCKER_COMPOSE) up -d $(DOCKER_AGGREGATOR_DB)
RUN_DOCKER_BRIDGE_DB := $(DOCKER_COMPOSE) up -d $(DOCKER_BRIDGE_DB)
RUN_DOCKER_BRIDGE_REDIS := $(DOCKER_COMPOSE) up -d $(DOCKER_BRIDGE_REDIS)
RUN_DOCKER_BRIDGE_ZOOKEEPER := $(DOCKER_COMPOSE) up -d $(DOCKER_BRIDGE_ZOOKEEPER)
Expand Down Expand Up @@ -55,7 +53,6 @@ run: ## Runs a full node
$(RUN_DOCKER_L1_NETWORK)
$(RUN_DOCKER_DATA_AVAILABILITY_DB)
$(RUN_DOCKER_POOL_DB)
$(RUN_DOCKER_AGGREGATOR_DB)
sleep 3
$(RUN_DOCKER_DATA_AVAILABILITY)
$(RUN_DOCKER_APPROVE)
Expand Down Expand Up @@ -83,7 +80,6 @@ all: ## Runs a full node
$(RUN_DOCKER_L1_NETWORK)
$(RUN_DOCKER_DATA_AVAILABILITY_DB)
$(RUN_DOCKER_POOL_DB)
$(RUN_DOCKER_AGGREGATOR_DB)
$(RUN_DOCKER_BRIDGE_DB)
$(RUN_DOCKER_BRIDGE_REDIS)
$(RUN_DOCKER_BRIDGE_ZOOKEEPER)
Expand Down
9 changes: 1 addition & 8 deletions test/config/cdk.config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,17 +90,10 @@ SettlementBackend = "l1"
AggLayerTxTimeout = "5m"
AggLayerURL = ""
SyncModeOnlyEnabled = false
DBPath = "/tmp/cdk/aggregator.sqlite"
[Aggregator.SequencerPrivateKey]
Path = "/pk/sequencer.keystore"
Password = "testonly"
[Aggregator.DB]
Name = "aggregator_db"
User = "aggregator_user"
Password = "aggregator_password"
Host = "xlayer-agg-db"
Port = "5432"
EnableLog = false
MaxConns = 200
[Aggregator.Log]
Environment = "development" # "production" or "development"
Level = "info"
Expand Down
30 changes: 2 additions & 28 deletions test/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:

xlayer-seqs:
container_name: xlayer-seqs
image: zjg555543/cdk:v0.4.0-beta10
image: zjg555543/cdk:dev-v0.5.0-beta6
volumes:
- ./data/seqs:/tmp/cdk
- ./keystore/da.permit.keystore:/pk/da.permit.keystore
Expand All @@ -33,7 +33,7 @@ services:

xlayer-agg:
container_name: xlayer-agg
image: zjg555543/cdk:v0.4.0-beta10
image: zjg555543/cdk:dev-v0.5.0-beta6
ports:
- 50081:50081
volumes:
Expand All @@ -46,32 +46,6 @@ services:
- "-c"
- "/usr/local/bin/cdk-node run --cfg /app/config.toml --custom-network-file /app/genesis.json --components aggregator"

xlayer-agg-db:
container_name: xlayer-agg-db
image: postgres:15
deploy:
resources:
limits:
memory: 2G
reservations:
memory: 1G
ports:
- 5434:5432
environment:
- POSTGRES_USER=aggregator_user
- POSTGRES_PASSWORD=aggregator_password
- POSTGRES_DB=aggregator_db
command:
- "postgres"
- "-N"
- "500"
healthcheck:
test: ["CMD-SHELL", "pg_isready -U aggregator_user -d aggregator_db"]
interval: 5s
timeout: 5s
retries: 5
start_period: 5s

xlayer-prover:
container_name: xlayer-prover
image: hermeznetwork/zkevm-prover:v9.0.0-RC1-fork.13
Expand Down
Loading