diff --git a/Dockerfile b/Dockerfile index be4c20ad22..68f7bd9a77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,8 +13,8 @@ RUN cd /src && make build # CONTAINER FOR RUNNING BINARY FROM alpine:3.18.0 -COPY --from=build /src/dist/zkevm-node /app/zkevm-node +COPY --from=build /src/dist/cdk-validium-node /app/cdk-validium-node COPY --from=build /src/config/environments/testnet/node.config.toml /app/example.config.toml RUN apk update && apk add postgresql15-client EXPOSE 8123 -CMD ["/bin/sh", "-c", "/app/zkevm-node run"] +CMD ["/bin/sh", "-c", "/app/cdk-validium-node run"] diff --git a/Makefile b/Makefile index 729ef770c9..e3d7842f23 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ endif GOBASE := $(shell pwd) GOBIN := $(GOBASE)/dist GOENVVARS := GOBIN=$(GOBIN) CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) -GOBINARY := zkevm-node +GOBINARY := cdk-validium-node GOCMD := $(GOBASE)/cmd LDFLAGS += -X 'github.com/0xPolygonHermez/zkevm-node.Version=$(VERSION)' @@ -80,11 +80,11 @@ build: ## Builds the binary locally into ./dist .PHONY: build-docker build-docker: ## Builds a docker image with the node binary - docker build -t zkevm-node -f ./Dockerfile . + docker build -t $(GOBINARY) -f ./Dockerfile . .PHONY: build-docker-nc build-docker-nc: ## Builds a docker image with the node binary - but without build cache - docker build --no-cache=true -t zkevm-node -f ./Dockerfile . + docker build --no-cache=true -t $(GOBINARY) -f ./Dockerfile . .PHONY: run-rpc run-rpc: ## Runs all the services needed to run a local zkEVM RPC node diff --git a/test/docker-compose.yml b/test/docker-compose.yml index c0717b211a..b4978b8495 100644 --- a/test/docker-compose.yml +++ b/test/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" networks: default: name: zkevm - + services: grafana: container_name: grafana @@ -65,7 +65,7 @@ services: command: - "/bin/sh" - "-c" - - "/app/zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components sequencer" + - "/app/cdk-validium-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components sequencer" zkevm-sequence-sender: container_name: zkevm-sequence-sender @@ -83,7 +83,7 @@ services: command: - "/bin/sh" - "-c" - - "/app/zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components sequence-sender" + - "/app/cdk-validium-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components sequence-sender" zkevm-json-rpc: container_name: zkevm-json-rpc @@ -103,7 +103,7 @@ services: command: - "/bin/sh" - "-c" - - "/app/zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components rpc" + - "/app/cdk-validium-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components rpc" zkevm-aggregator: container_name: zkevm-aggregator @@ -120,7 +120,7 @@ services: command: - "/bin/sh" - "-c" - - "/app/zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components aggregator" + - "/app/cdk-validium-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components aggregator" zkevm-sync: container_name: zkevm-sync @@ -137,7 +137,7 @@ services: command: - "/bin/sh" - "-c" - - "/app/zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components synchronizer" + - "/app/cdk-validium-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components synchronizer" zkevm-eth-tx-manager: container_name: zkevm-eth-tx-manager @@ -154,7 +154,7 @@ services: command: - "/bin/sh" - "-c" - - "/app/zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components eth-tx-manager" + - "/app/cdk-validium-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components eth-tx-manager" zkevm-l2gaspricer: container_name: zkevm-l2gaspricer @@ -168,7 +168,7 @@ services: command: - "/bin/sh" - "-c" - - "/app/zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components l2gaspricer" + - "/app/cdk-validium-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components l2gaspricer" zkevm-state-db: container_name: zkevm-state-db @@ -305,7 +305,7 @@ services: command: - "/bin/sh" - "-c" - - "/app/zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components rpc --http.api eth,net,debug,zkevm,txpool,web3" + - "/app/cdk-validium-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components rpc --http.api eth,net,debug,zkevm,txpool,web3" zkevm-explorer-l2-db: container_name: zkevm-explorer-l2-db @@ -369,7 +369,7 @@ services: command: - "/bin/sh" - "-c" - - "/app/zkevm-node approve --network custom --custom-network-file /app/genesis.json --key-store-path /pk/keystore --pw testonly --am 115792089237316195423570985008687907853269984665640564039457584007913129639935 -y --cfg /app/config.toml" + - "/app/cdk-validium-node approve --network custom --custom-network-file /app/genesis.json --key-store-path /pk/keystore --pw testonly --am 115792089237316195423570985008687907853269984665640564039457584007913129639935 -y --cfg /app/config.toml" zkevm-permissionless-db: container_name: zkevm-permissionless-db @@ -418,7 +418,7 @@ services: command: - "/bin/sh" - "-c" - - "/app/zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components \"rpc,synchronizer\"" + - "/app/cdk-validium-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components \"rpc,synchronizer\"" zkevm-permissionless-prover: container_name: zkevm-permissionless-prover @@ -448,7 +448,7 @@ services: zkevm-sh: container_name: zkevm-sh image: zkevm-node - stdin_open: true + stdin_open: true tty: true environment: - ZKEVM_NODE_STATE_DB_HOST=zkevm-state-db @@ -485,7 +485,7 @@ services: command: - "/bin/sh" - "-c" - - "/app/zkevm-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components \"rpc,synchronizer\"" + - "/app/cdk-validium-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components \"rpc,synchronizer\"" zkevm-data-node-db: container_name: zkevm-data-node-db @@ -505,4 +505,4 @@ services: command: - "postgres" - "-N" - - "500" \ No newline at end of file + - "500"