From 42d3afb5a24ab4f6cab0ba8b1e2ab1e48b2bba45 Mon Sep 17 00:00:00 2001 From: Sergio Mena Date: Wed, 18 Jan 2023 14:37:54 +0100 Subject: [PATCH] [backport] Renaming in docker-related files (#123) * [cherry-picked] Renaming in docker-related files (#110) * Performed renaming in docker-related files * Fix e2e launch * one more * revert rename of tendermint-docker.yml * unrevert renaming tendermint-docker.yml * Rename TENDERMINT_BUILD_OPTIONS to COMETBFT_BUILD_OPTIONS all over * Linter error * Revert `cometbft-proof` to `tendermint-proof` * Replaced TENDERMINT_VERSION --> COMETBFT_VERSION all over the codebase --- ...dermint-docker.yml => cometbft-docker.yml} | 6 +-- DOCKER/.gitignore | 2 +- DOCKER/Dockerfile | 22 +++++----- DOCKER/Dockerfile.build_c-amazonlinux | 6 +-- DOCKER/Makefile | 4 +- DOCKER/README.md | 34 +++++++-------- DOCKER/build.sh | 2 +- DOCKER/docker-entrypoint.sh | 6 +-- DOCKER/push.sh | 6 +-- Makefile | 42 +++++++++---------- docker-compose.yml | 24 +++++------ docs/introduction/install.md | 4 +- docs/networks/docker-compose.md | 32 +++++++------- docs/tendermint-core/running-in-production.md | 2 +- networks/local/Makefile | 2 +- networks/local/localnode/Dockerfile | 6 +-- .../ansible/roles/logzio/tasks/main.yml | 12 +++--- test/docker/Dockerfile | 8 ++-- test/e2e/Makefile | 2 +- test/e2e/docker/Dockerfile | 16 +++---- test/e2e/docker/entrypoint | 4 +- test/e2e/docker/entrypoint-builtin | 2 +- test/e2e/pkg/infra/docker/docker.go | 4 +- tools/tm-signer-harness/Dockerfile | 4 +- tools/tm-signer-harness/Makefile | 6 +-- 25 files changed, 129 insertions(+), 129 deletions(-) rename .github/workflows/{tendermint-docker.yml => cometbft-docker.yml} (90%) diff --git a/.github/workflows/tendermint-docker.yml b/.github/workflows/cometbft-docker.yml similarity index 90% rename from .github/workflows/tendermint-docker.yml rename to .github/workflows/cometbft-docker.yml index 7f475903e..d0db4c22c 100644 --- a/.github/workflows/tendermint-docker.yml +++ b/.github/workflows/cometbft-docker.yml @@ -1,6 +1,6 @@ name: Docker -# Build & Push rebuilds the Tendermint docker image on every push to main and creation of tags -# and pushes the image to https://hub.docker.com/r/cometbft/tendermint +# Build & Push rebuilds the CometBFT docker image on every push to main and creation of tags +# and pushes the image to https://hub.docker.com/r/cometbft/cometbft on: push: branches: @@ -19,7 +19,7 @@ jobs: - name: Prepare id: prep run: | - DOCKER_IMAGE=cometbft/tendermint + DOCKER_IMAGE=cometbft/cometbft VERSION=noop if [[ $GITHUB_REF == refs/tags/* ]]; then VERSION=${GITHUB_REF#refs/tags/} diff --git a/DOCKER/.gitignore b/DOCKER/.gitignore index 9059c6848..3af87e780 100644 --- a/DOCKER/.gitignore +++ b/DOCKER/.gitignore @@ -1 +1 @@ -tendermint +cometbft diff --git a/DOCKER/Dockerfile b/DOCKER/Dockerfile index df4e3f49a..30d0443fd 100644 --- a/DOCKER/Dockerfile +++ b/DOCKER/Dockerfile @@ -2,30 +2,30 @@ # hopefully current, go version. ARG GOLANG_BASE_IMAGE=golang:1.18-alpine -# stage 1 Generate Tendermint Binary +# stage 1 Generate CometBFT Binary FROM --platform=$BUILDPLATFORM $GOLANG_BASE_IMAGE as builder RUN apk update && \ apk upgrade && \ apk --no-cache add make -COPY / /tendermint -WORKDIR /tendermint +COPY / /cometbft +WORKDIR /cometbft RUN TARGETPLATFORM=$TARGETPLATFORM make build-linux # stage 2 FROM $GOLANG_BASE_IMAGE -LABEL maintainer="hello@tendermint.com" +LABEL maintainer="hello@informal.systems" -# Tendermint will be looking for the genesis file in /tendermint/config/genesis.json +# CometBFT will be looking for the genesis file in /cometbft/config/genesis.json # (unless you change `genesis_file` in config.toml). You can put your config.toml and -# private validator file into /tendermint/config. +# private validator file into /cometbft/config. # -# The /tendermint/data dir is used by tendermint to store state. -ENV TMHOME /tendermint +# The /cometbft/data dir is used by CometBFT to store state. +ENV TMHOME /cometbft # OS environment setup # Set user right away for determinism, create directory for persistence and give our user ownership # jq and curl used for extracting `pub_key` from private validator while -# deploying tendermint with Kubernetes. It is nice to have bash so the users +# deploying CometBFT with Kubernetes. It is nice to have bash so the users # could execute bash commands. RUN apk update && \ apk upgrade && \ @@ -43,11 +43,11 @@ EXPOSE 26656 26657 26660 STOPSIGNAL SIGTERM -COPY --from=builder /tendermint/build/tendermint /usr/bin/tendermint +COPY --from=builder /cometbft/build/cometbft /usr/bin/cometbft # You can overwrite these before the first run to influence # config.json and genesis.json. Additionally, you can override -# CMD to add parameters to `tendermint node`. +# CMD to add parameters to `cometbft node`. ENV PROXY_APP=kvstore MONIKER=dockernode CHAIN_ID=dockerchain COPY ./DOCKER/docker-entrypoint.sh /usr/local/bin/ diff --git a/DOCKER/Dockerfile.build_c-amazonlinux b/DOCKER/Dockerfile.build_c-amazonlinux index 05bc7e265..633b2a997 100644 --- a/DOCKER/Dockerfile.build_c-amazonlinux +++ b/DOCKER/Dockerfile.build_c-amazonlinux @@ -21,8 +21,8 @@ ENV PATH=$PATH:/usr/local/go/bin:/go/bin ENV GOBIN=/go/bin ENV GOPATH=/go/src -RUN mkdir -p /tendermint -WORKDIR /tendermint +RUN mkdir -p /cometbft +WORKDIR /cometbft -CMD ["/usr/bin/make", "build", "TENDERMINT_BUILD_OPTIONS=cleveldb"] +CMD ["/usr/bin/make", "build", "COMETBFT_BUILD_OPTIONS=cleveldb"] diff --git a/DOCKER/Makefile b/DOCKER/Makefile index 8f6dff372..103d70c4d 100644 --- a/DOCKER/Makefile +++ b/DOCKER/Makefile @@ -5,9 +5,9 @@ push: @sh -c "'$(CURDIR)/push.sh'" build_testing: - docker build --tag tendermint/testing -f ./Dockerfile.testing . + docker build --tag cometbft/testing -f ./Dockerfile.testing . build_amazonlinux_buildimage: - docker build -t "tendermint/tendermint:build_c-amazonlinux" -f Dockerfile.build_c-amazonlinux . + docker build -t "cometbft/cometbft:build_c-amazonlinux" -f Dockerfile.build_c-amazonlinux . .PHONY: build push build_testing build_amazonlinux_buildimage diff --git a/DOCKER/README.md b/DOCKER/README.md index 66a02b3f0..cc7978bc0 100644 --- a/DOCKER/README.md +++ b/DOCKER/README.md @@ -2,42 +2,42 @@ ## Supported tags and respective `Dockerfile` links -DockerHub tags for official releases are [here](https://hub.docker.com/r/tendermint/tendermint/tags/). The "latest" tag will always point to the highest version number. +DockerHub tags for official releases are [here](https://hub.docker.com/r/cometbft/cometbft/tags/). The "latest" tag will always point to the highest version number. -Official releases can be found [here](https://github.com/tendermint/tendermint/releases). +Official releases can be found [here](https://github.com/cometbft/cometbft/releases). -The Dockerfile for Tendermint is not expected to change in the near future. The main file used for all builds can be found [here](https://raw.githubusercontent.com/tendermint/tendermint/main/DOCKER/Dockerfile). +The Dockerfile for CometBFT is not expected to change in the near future. The main file used for all builds can be found [here](https://raw.githubusercontent.com/cometbft/cometbft/main/DOCKER/Dockerfile). -Respective versioned files can be found (replace the Xs with the version number). +Respective versioned files can be found (replace the Xs with the version number). ## Quick reference -- **Where to get help:** -- **Where to file issues:** +- **Where to get help:** +- **Where to file issues:** - **Supported Docker versions:** [the latest release](https://github.com/moby/moby/releases) (down to 1.6 on a best-effort basis) -## Tendermint +## CometBFT -Tendermint Core is Byzantine Fault Tolerant (BFT) middleware that takes a state transition machine, written in any programming language, and securely replicates it on many machines. +CometBFT is Byzantine Fault Tolerant (BFT) middleware that takes a state transition machine, written in any programming language, and securely replicates it on many machines. -For more background, see the [the docs](https://docs.tendermint.com/v0.37/introduction/#quick-start). +For more background, see the [the docs](https://docs.cometbft.com/v0.37/introduction/#quick-start). -To get started developing applications, see the [application developers guide](https://docs.tendermint.com/v0.37/introduction/quick-start.html). +To get started developing applications, see the [application developers guide](https://docs.cometbft.com/v0.37/introduction/quick-start.html). ## How to use this image -### Start one instance of the Tendermint core with the `kvstore` app +### Start one instance of the CometBFT with the `kvstore` app -A quick example of a built-in app and Tendermint core in one container. +A quick example of a built-in app and CometBFT in one container. ```sh -docker run -it --rm -v "/tmp:/tendermint" tendermint/tendermint init -docker run -it --rm -v "/tmp:/tendermint" tendermint/tendermint node --proxy_app=kvstore +docker run -it --rm -v "/tmp:/cometbft" cometbft/cometbft init +docker run -it --rm -v "/tmp:/cometbft" cometbft/cometbft node --proxy_app=kvstore ``` ## Local cluster -To run a 4-node network, see the `Makefile` in the root of [the repo](https://github.com/tendermint/tendermint/blob/v0.37.x/Makefile) and run: +To run a 4-node network, see the `Makefile` in the root of [the repo](https://github.com/cometbft/cometbft/blob/v0.37.x/Makefile) and run: ```sh make build-linux @@ -49,8 +49,8 @@ Note that this will build and use a different image than the ones provided here. ## License -- Tendermint's license is [Apache 2.0](https://github.com/tendermint/tendermint/blob/main/LICENSE). +- CometBFT's license is [Apache 2.0](https://github.com/cometbft/cometbft/blob/main/LICENSE). ## Contributing -Contributions are most welcome! See the [contributing file](https://github.com/tendermint/tendermint/blob/v0.37.x/CONTRIBUTING.md) for more information. +Contributions are most welcome! See the [contributing file](https://github.com/cometbft/cometbft/blob/v0.37.x/CONTRIBUTING.md) for more information. diff --git a/DOCKER/build.sh b/DOCKER/build.sh index 2aa42a6cd..01684c1cb 100755 --- a/DOCKER/build.sh +++ b/DOCKER/build.sh @@ -16,5 +16,5 @@ read -p "==> Build 3 docker images with the following tags (latest, $TAG, $TAG_N echo if [[ $REPLY =~ ^[Yy]$ ]] then - docker build -t "tendermint/tendermint" -t "tendermint/tendermint:$TAG" -t "tendermint/tendermint:$TAG_NO_PATCH" . + docker build -t "cometbft/cometbft" -t "cometbft/cometbft:$TAG" -t "cometbft/cometbft:$TAG_NO_PATCH" . fi diff --git a/DOCKER/docker-entrypoint.sh b/DOCKER/docker-entrypoint.sh index 0cb45c58a..f8f4502d3 100755 --- a/DOCKER/docker-entrypoint.sh +++ b/DOCKER/docker-entrypoint.sh @@ -2,8 +2,8 @@ set -e if [ ! -d "$TMHOME/config" ]; then - echo "Running tendermint init to create (default) configuration for docker run." - tendermint init + echo "Running cometbft init to create (default) configuration for docker run." + cometbft init sed -i \ -e "s/^proxy_app\s*=.*/proxy_app = \"$PROXY_APP\"/" \ @@ -20,4 +20,4 @@ if [ ! -d "$TMHOME/config" ]; then mv "$TMHOME/config/genesis.json.new" "$TMHOME/config/genesis.json" fi -exec tendermint "$@" +exec cometbft "$@" diff --git a/DOCKER/push.sh b/DOCKER/push.sh index f228406d4..3ceeeeba9 100755 --- a/DOCKER/push.sh +++ b/DOCKER/push.sh @@ -16,7 +16,7 @@ read -p "==> Push 3 docker images with the following tags (latest, $TAG, $TAG_NO echo if [[ $REPLY =~ ^[Yy]$ ]] then - docker push "tendermint/tendermint:latest" - docker push "tendermint/tendermint:$TAG" - docker push "tendermint/tendermint:$TAG_NO_PATCH" + docker push "cometbft/cometbft:latest" + docker push "cometbft/cometbft:$TAG" + docker push "cometbft/cometbft:$TAG_NO_PATCH" fi diff --git a/Makefile b/Makefile index bca6ed2c9..8bed6d2c7 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ PACKAGES=$(shell go list ./...) BUILDDIR?=$(CURDIR)/build -OUTPUT?=$(BUILDDIR)/tendermint +OUTPUT?=$(BUILDDIR)/cometbft -BUILD_TAGS?=tendermint +BUILD_TAGS?=cometbft # If building a release, please checkout the version tag to get the correct version setting ifneq ($(shell git symbolic-ref -q --short HEAD),) @@ -13,40 +13,40 @@ endif LD_FLAGS = -X github.com/tendermint/tendermint/version.TMCoreSemVer=$(VERSION) BUILD_FLAGS = -mod=readonly -ldflags "$(LD_FLAGS)" -HTTPS_GIT := https://github.com/tendermint/tendermint.git +HTTPS_GIT := https://github.com/cometbft/cometbft.git CGO_ENABLED ?= 0 # handle nostrip -ifeq (,$(findstring nostrip,$(TENDERMINT_BUILD_OPTIONS))) +ifeq (,$(findstring nostrip,$(COMETBFT_BUILD_OPTIONS))) BUILD_FLAGS += -trimpath LD_FLAGS += -s -w endif # handle race -ifeq (race,$(findstring race,$(TENDERMINT_BUILD_OPTIONS))) +ifeq (race,$(findstring race,$(COMETBFT_BUILD_OPTIONS))) CGO_ENABLED=1 BUILD_FLAGS += -race endif # handle cleveldb -ifeq (cleveldb,$(findstring cleveldb,$(TENDERMINT_BUILD_OPTIONS))) +ifeq (cleveldb,$(findstring cleveldb,$(COMETBFT_BUILD_OPTIONS))) CGO_ENABLED=1 BUILD_TAGS += cleveldb endif # handle badgerdb -ifeq (badgerdb,$(findstring badgerdb,$(TENDERMINT_BUILD_OPTIONS))) +ifeq (badgerdb,$(findstring badgerdb,$(COMETBFT_BUILD_OPTIONS))) BUILD_TAGS += badgerdb endif # handle rocksdb -ifeq (rocksdb,$(findstring rocksdb,$(TENDERMINT_BUILD_OPTIONS))) +ifeq (rocksdb,$(findstring rocksdb,$(COMETBFT_BUILD_OPTIONS))) CGO_ENABLED=1 BUILD_TAGS += rocksdb endif # handle boltdb -ifeq (boltdb,$(findstring boltdb,$(TENDERMINT_BUILD_OPTIONS))) +ifeq (boltdb,$(findstring boltdb,$(COMETBFT_BUILD_OPTIONS))) BUILD_TAGS += boltdb endif @@ -236,7 +236,7 @@ go.sum: go.mod draw_deps: @# requires brew install graphviz or apt-get install graphviz go get github.com/RobotsAndPencils/goviz - @goviz -i github.com/tendermint/tendermint/cmd/tendermint -d 3 | dot -Tpng -o dependency-graph.png + @goviz -i github.com/cometbft/cometbft/cmd/tendermint -d 3 | dot -Tpng -o dependency-graph.png .PHONY: draw_deps get_deps_bin_size: @@ -252,9 +252,9 @@ get_deps_bin_size: # generates certificates for TLS testing in remotedb and RPC server gen_certs: clean_certs - certstrap init --common-name "tendermint.com" --passphrase "" + certstrap init --common-name "cometbft.com" --passphrase "" certstrap request-cert --common-name "server" -ip "127.0.0.1" --passphrase "" - certstrap sign "server" --CA "tendermint.com" --passphrase "" + certstrap sign "server" --CA "cometbft.com" --passphrase "" mv out/server.crt rpc/jsonrpc/server/test.crt mv out/server.key rpc/jsonrpc/server/test.key rm -rf out @@ -272,7 +272,7 @@ clean_certs: format: find . -name '*.go' -type f -not -path "*.git*" -not -name '*.pb.go' -not -name '*pb_test.go' | xargs gofmt -w -s - find . -name '*.go' -type f -not -path "*.git*" -not -name '*.pb.go' -not -name '*pb_test.go' | xargs goimports -w -local github.com/tendermint/tendermint + find . -name '*.go' -type f -not -path "*.git*" -not -name '*.pb.go' -not -name '*pb_test.go' | xargs goimports -w -local github.com/cometbft/cometbft .PHONY: format lint: @@ -290,7 +290,7 @@ DESTINATION = ./index.html.md ### Documentation ### ############################################################################### -DOCS_OUTPUT?=/tmp/tendermint-core-docs +DOCS_OUTPUT?=/tmp/cometbft-core-docs # This builds a docs site for each branch/tag in `./docs/versions` and copies # each site to a version prefixed path. The last entry inside the `versions` @@ -335,9 +335,9 @@ check-docs-toc: ############################################################################### build-docker: build-linux - cp $(OUTPUT) DOCKER/tendermint - docker build --label=tendermint --tag="tendermint/tendermint" DOCKER - rm -rf DOCKER/tendermint + cp $(OUTPUT) DOCKER/cometbft + docker build --label=cometbft --tag="cometbft/cometbft" DOCKER + rm -rf DOCKER/cometbft .PHONY: build-docker ############################################################################### @@ -353,17 +353,17 @@ build-docker-localnode: @cd networks/local && make .PHONY: build-docker-localnode -# Runs `make build TENDERMINT_BUILD_OPTIONS=cleveldb` from within an Amazon +# Runs `make build COMETBFT_BUILD_OPTIONS=cleveldb` from within an Amazon # Linux (v2)-based Docker build container in order to build an Amazon -# Linux-compatible binary. Produces a compatible binary at ./build/tendermint +# Linux-compatible binary. Produces a compatible binary at ./build/cometbft build_c-amazonlinux: $(MAKE) -C ./DOCKER build_amazonlinux_buildimage - docker run --rm -it -v `pwd`:/tendermint tendermint/tendermint:build_c-amazonlinux + docker run --rm -it -v `pwd`:/cometbft cometbft/cometbft:build_c-amazonlinux .PHONY: build_c-amazonlinux # Run a 4-node testnet locally localnet-start: localnet-stop build-docker-localnode - @if ! [ -f build/node0/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/tendermint:Z tendermint/localnode testnet --config /etc/tendermint/config-template.toml --o . --starting-ip-address 192.167.10.2; fi + @if ! [ -f build/node0/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/cometbft:Z cometbft/localnode testnet --config /etc/cometbft/config-template.toml --o . --starting-ip-address 192.167.10.2; fi docker-compose up .PHONY: localnet-start diff --git a/docker-compose.yml b/docker-compose.yml index 647e1f202..ee5828719 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,56 +3,56 @@ version: '3' services: node0: container_name: node0 - image: "tendermint/localnode" + image: "cometbft/localnode" ports: - "26656-26657:26656-26657" environment: - ID=0 - - LOG=${LOG:-tendermint.log} + - LOG=${LOG:-cometbft.log} volumes: - - ./build:/tendermint:Z + - ./build:/cometbft:Z networks: localnet: ipv4_address: 192.167.10.2 node1: container_name: node1 - image: "tendermint/localnode" + image: "cometbft/localnode" ports: - "26659-26660:26656-26657" environment: - ID=1 - - LOG=${LOG:-tendermint.log} + - LOG=${LOG:-cometbft.log} volumes: - - ./build:/tendermint:Z + - ./build:/cometbft:Z networks: localnet: ipv4_address: 192.167.10.3 node2: container_name: node2 - image: "tendermint/localnode" + image: "cometbft/localnode" environment: - ID=2 - - LOG=${LOG:-tendermint.log} + - LOG=${LOG:-cometbft.log} ports: - "26661-26662:26656-26657" volumes: - - ./build:/tendermint:Z + - ./build:/cometbft:Z networks: localnet: ipv4_address: 192.167.10.4 node3: container_name: node3 - image: "tendermint/localnode" + image: "cometbft/localnode" environment: - ID=3 - - LOG=${LOG:-tendermint.log} + - LOG=${LOG:-cometbft.log} ports: - "26663-26664:26656-26657" volumes: - - ./build:/tendermint:Z + - ./build:/cometbft:Z networks: localnet: ipv4_address: 192.167.10.5 diff --git a/docs/introduction/install.md b/docs/introduction/install.md index 72a34306a..85046f049 100644 --- a/docs/introduction/install.md +++ b/docs/introduction/install.md @@ -108,13 +108,13 @@ db_backend = "cleveldb" To install Tendermint, run: ```sh -CGO_LDFLAGS="-lsnappy" make install TENDERMINT_BUILD_OPTIONS=cleveldb +CGO_LDFLAGS="-lsnappy" make install COMETBFT_BUILD_OPTIONS=cleveldb ``` or run: ```sh -CGO_LDFLAGS="-lsnappy" make build TENDERMINT_BUILD_OPTIONS=cleveldb +CGO_LDFLAGS="-lsnappy" make build COMETBFT_BUILD_OPTIONS=cleveldb ``` which puts the binary in `./build`. diff --git a/docs/networks/docker-compose.md b/docs/networks/docker-compose.md index f1e9bb640..57838392d 100644 --- a/docs/networks/docker-compose.md +++ b/docs/networks/docker-compose.md @@ -8,13 +8,13 @@ With Docker Compose, you can spin up local testnets with a single command. ## Requirements -1. [Install tendermint](../introduction/install.md) +1. [Install CometBFT](../introduction/install.md) 2. [Install docker](https://docs.docker.com/engine/installation/) 3. [Install docker-compose](https://docs.docker.com/compose/install/) ## Build -Build the `tendermint` binary and, optionally, the `tendermint/localnode` +Build the `cometbft` binary and, optionally, the `cometbft/localnode` docker image. Note the binary will be mounted into the container so it can be updated without @@ -24,7 +24,7 @@ rebuilding the image. # Build the linux binary in ./build make build-linux -# (optionally) Build tendermint/localnode image +# (optionally) Build cometbft/localnode image make build-docker-localnode ``` @@ -54,16 +54,16 @@ make localnet-start ## Configuration The `make localnet-start` creates files for a 4-node testnet in `./build` by -calling the `tendermint testnet` command. +calling the `cometbft testnet` command. -The `./build` directory is mounted to the `/tendermint` mount point to attach +The `./build` directory is mounted to the `/cometbft` mount point to attach the binary and config files to the container. To change the number of validators / non-validators change the `localnet-start` Makefile target [here](../../Makefile): ```makefile localnet-start: localnet-stop - @if ! [ -f build/node0/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/tendermint:Z tendermint/localnode testnet --v 5 --n 3 --o . --populate-persistent-peers --starting-ip-address 192.167.10.2 ; fi + @if ! [ -f build/node0/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/cometbft:Z cometbft/localnode testnet --v 5 --n 3 --o . --populate-persistent-peers --starting-ip-address 192.167.10.2 ; fi docker-compose up ``` @@ -74,14 +74,14 @@ Adding 4 more nodes is required in order to fully utilize the config files that ```yml node3: # bump by 1 for every node container_name: node3 # bump by 1 for every node - image: "tendermint/localnode" + image: "cometbft/localnode" environment: - ID=3 - - LOG=${LOG:-tendermint.log} + - LOG=${LOG:-cometbft.log} ports: - "26663-26664:26656-26657" # Bump 26663-26664 by one for every node volumes: - - ./build:/tendermint:Z + - ./build:/cometbft:Z networks: localnet: ipv4_address: 192.167.10.5 # bump the final digit by 1 for every node @@ -96,7 +96,7 @@ rm -rf ./build/node* ## Configuring ABCI containers -To use your own ABCI applications with 4-node setup edit the [docker-compose.yaml](https://github.com/tendermint/tendermint/blob/v0.34.x/docker-compose.yml) file and add image to your ABCI application. +To use your own ABCI applications with 4-node setup edit the [docker-compose.yaml](https://github.com/cometbft/cometbft/blob/v0.34.x/docker-compose.yml) file and add image to your ABCI application. ```yml abci0: @@ -145,30 +145,30 @@ To use your own ABCI applications with 4-node setup edit the [docker-compose.yam ``` -Override the [command](https://github.com/tendermint/tendermint/blob/v0.34.x/networks/local/localnode/Dockerfile#L12) in each node to connect to it's ABCI. +Override the [command](https://github.com/cometbft/cometbft/blob/v0.34.x/networks/local/localnode/Dockerfile#L12) in each node to connect to it's ABCI. ```yml node0: container_name: node0 - image: "tendermint/localnode" + image: "cometbft/localnode" ports: - "26656-26657:26656-26657" environment: - ID=0 - - LOG=$${LOG:-tendermint.log} + - LOG=$${LOG:-cometbft.log} volumes: - - ./build:/tendermint:Z + - ./build:/cometbft:Z command: node --proxy_app=tcp://abci0:26658 networks: localnet: ipv4_address: 192.167.10.2 ``` -Similarly do for node1, node2 and node3 then [run testnet](https://github.com/tendermint/tendermint/blob/v0.34.x/docs/networks/docker-compose.md#run-a-testnet) +Similarly do for node1, node2 and node3 then [run testnet](https://github.com/cometbft/cometbft/blob/v0.34.x/docs/networks/docker-compose.md#run-a-testnet) ## Logging -Log is saved under the attached volume, in the `tendermint.log` file. If the +Log is saved under the attached volume, in the `cometbft.log` file. If the `LOG` environment variable is set to `stdout` at start, the log is not saved, but printed on the screen. diff --git a/docs/tendermint-core/running-in-production.md b/docs/tendermint-core/running-in-production.md index 9aa397f54..624a6bb2a 100644 --- a/docs/tendermint-core/running-in-production.md +++ b/docs/tendermint-core/running-in-production.md @@ -9,7 +9,7 @@ order: 4 By default, Tendermint uses the `syndtr/goleveldb` package for its in-process key-value database. If you want maximal performance, it may be best to install the real C-implementation of LevelDB and compile Tendermint to use that using -`make build TENDERMINT_BUILD_OPTIONS=cleveldb`. See the [install +`make build COMETBFT_BUILD_OPTIONS=cleveldb`. See the [install instructions](../introduction/install.md) for details. Tendermint keeps multiple distinct databases in the `$TMROOT/data`: diff --git a/networks/local/Makefile b/networks/local/Makefile index 98517851d..c2d52334e 100644 --- a/networks/local/Makefile +++ b/networks/local/Makefile @@ -1,7 +1,7 @@ # Makefile for the "localnode" docker image. all: - docker build --tag tendermint/localnode localnode + docker build --tag cometbft/localnode localnode .PHONY: all diff --git a/networks/local/localnode/Dockerfile b/networks/local/localnode/Dockerfile index ac4bc6071..5ff8c74c2 100644 --- a/networks/local/localnode/Dockerfile +++ b/networks/local/localnode/Dockerfile @@ -4,12 +4,12 @@ RUN apk update && \ apk upgrade && \ apk --no-cache add curl jq file -VOLUME [ /tendermint ] -WORKDIR /tendermint +VOLUME [ /cometbft ] +WORKDIR /cometbft EXPOSE 26656 26657 ENTRYPOINT ["/usr/bin/wrapper.sh"] CMD ["node", "--proxy_app", "kvstore"] STOPSIGNAL SIGTERM COPY wrapper.sh /usr/bin/wrapper.sh -COPY config-template.toml /etc/tendermint/config-template.toml +COPY config-template.toml /etc/cometbft/config-template.toml diff --git a/networks/remote/ansible/roles/logzio/tasks/main.yml b/networks/remote/ansible/roles/logzio/tasks/main.yml index 5131d98ac..7a8290b02 100644 --- a/networks/remote/ansible/roles/logzio/tasks/main.yml +++ b/networks/remote/ansible/roles/logzio/tasks/main.yml @@ -7,10 +7,10 @@ - name: Create folders file: "path={{item}} state=directory recurse=yes" with_items: - - /etc/journalbeat - - /etc/pki/tls/certs - - /usr/share/journalbeat - - /var/log/journalbeat + - /etc/journalbeat + - /etc/pki/tls/certs + - /usr/share/journalbeat + - /var/log/journalbeat - name: Copy journalbeat config template: src=journalbeat.yml.j2 dest=/etc/journalbeat/journalbeat.yml mode=0600 @@ -22,5 +22,5 @@ - name: Copy journalbeat service config copy: src=journalbeat.service dest=/etc/systemd/system/journalbeat.service notify: - - reload daemon - - restart journalbeat + - reload daemon + - restart journalbeat diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile index 3628be9f9..3dd11ce7e 100644 --- a/test/docker/Dockerfile +++ b/test/docker/Dockerfile @@ -5,8 +5,8 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends \ jq bsdmainutils vim-common psmisc netcat curl -# Setup tendermint repo -ENV REPO $GOPATH/src/github.com/tendermint/tendermint +# Setup CometBFT repo +ENV REPO $GOPATH/src/github.com/cometbft/cometbft ENV GOBIN $GOPATH/bin WORKDIR $REPO @@ -21,10 +21,10 @@ RUN make tools # install ABCI CLI RUN make install_abci -# install Tendermint +# install CometBFT RUN make install -RUN tendermint testnet \ +RUN cometbft testnet \ --config $REPO/test/docker/config-template.toml \ --node-dir-prefix="mach" \ --v=4 \ diff --git a/test/e2e/Makefile b/test/e2e/Makefile index bde35361a..bf19ec9ae 100644 --- a/test/e2e/Makefile +++ b/test/e2e/Makefile @@ -1,7 +1,7 @@ all: docker generator runner docker: - docker build --tag tendermint/e2e-node --tag tendermint/e2e-node:local-version -f docker/Dockerfile ../.. + docker build --tag cometbft/e2e-node --tag cometbft/e2e-node:local-version -f docker/Dockerfile ../.. # We need to build support for database backends into the app in # order to build a binary with a CometBFT node in it (for built-in diff --git a/test/e2e/docker/Dockerfile b/test/e2e/docker/Dockerfile index 0eaad525c..b462b2c9f 100644 --- a/test/e2e/docker/Dockerfile +++ b/test/e2e/docker/Dockerfile @@ -6,25 +6,25 @@ FROM golang:1.18 RUN apt-get -qq update -y && apt-get -qq upgrade -y >/dev/null RUN apt-get -qq install -y libleveldb-dev librocksdb-dev >/dev/null -# Set up build directory /src/tendermint -ENV TENDERMINT_BUILD_OPTIONS badgerdb,boltdb,cleveldb,rocksdb -WORKDIR /src/tendermint +# Set up build directory /src/cometbft +ENV COMETBFT_BUILD_OPTIONS badgerdb,boltdb,cleveldb,rocksdb +WORKDIR /src/cometbft # Fetch dependencies separately (for layer caching) COPY go.mod go.sum ./ RUN go mod download -# Build Tendermint and install into /usr/bin/tendermint +# Build CometBFT and install into /usr/bin/cometbft COPY . . -RUN make build && cp build/tendermint /usr/bin/tendermint +RUN make build && cp build/cometbft /usr/bin/cometbft COPY test/e2e/docker/entrypoint* /usr/bin/ RUN cd test/e2e && make node && cp build/node /usr/bin/app # Set up runtime directory. We don't use a separate runtime image since we need # e.g. leveldb and rocksdb which are already installed in the build image. -WORKDIR /tendermint -VOLUME /tendermint -ENV TMHOME=/tendermint +WORKDIR /cometbft +VOLUME /cometbft +ENV TMHOME=/cometbft EXPOSE 26656 26657 26660 6060 ENTRYPOINT ["/usr/bin/entrypoint"] diff --git a/test/e2e/docker/entrypoint b/test/e2e/docker/entrypoint index 50d57a313..866e8ef87 100755 --- a/test/e2e/docker/entrypoint +++ b/test/e2e/docker/entrypoint @@ -3,8 +3,8 @@ # Forcibly remove any stray UNIX sockets left behind from previous runs rm -rf /var/run/privval.sock /var/run/app.sock -/usr/bin/app /tendermint/config/app.toml & +/usr/bin/app /cometbft/config/app.toml & sleep 1 -/usr/bin/tendermint "$@" +/usr/bin/cometbft "$@" diff --git a/test/e2e/docker/entrypoint-builtin b/test/e2e/docker/entrypoint-builtin index 3bec08671..b60399156 100755 --- a/test/e2e/docker/entrypoint-builtin +++ b/test/e2e/docker/entrypoint-builtin @@ -3,4 +3,4 @@ # Forcibly remove any stray UNIX sockets left behind from previous runs rm -rf /var/run/privval.sock /var/run/app.sock -/usr/bin/app /tendermint/config/app.toml +/usr/bin/app /cometbft/config/app.toml diff --git a/test/e2e/pkg/infra/docker/docker.go b/test/e2e/pkg/infra/docker/docker.go index 5c118f03b..a3779887d 100644 --- a/test/e2e/pkg/infra/docker/docker.go +++ b/test/e2e/pkg/infra/docker/docker.go @@ -57,7 +57,7 @@ services: labels: e2e: true container_name: {{ .Name }} - image: tendermint/e2e-node:{{ .Version }} + image: cometbft/e2e-node:{{ .Version }} {{- if eq .ABCIProtocol "builtin" }} entrypoint: /usr/bin/entrypoint-builtin {{- end }} @@ -67,7 +67,7 @@ services: - {{ if .ProxyPort }}{{ .ProxyPort }}:{{ end }}26657 - 6060 volumes: - - ./{{ .Name }}:/tendermint + - ./{{ .Name }}:/cometbft networks: {{ $.Name }}: ipv{{ if $.IPv6 }}6{{ else }}4{{ end}}_address: {{ .IP }} diff --git a/tools/tm-signer-harness/Dockerfile b/tools/tm-signer-harness/Dockerfile index 83f57a3d5..520b45290 100644 --- a/tools/tm-signer-harness/Dockerfile +++ b/tools/tm-signer-harness/Dockerfile @@ -1,4 +1,4 @@ -ARG TENDERMINT_VERSION=latest -FROM tendermint/tendermint:${TENDERMINT_VERSION} +ARG COMETBFT_VERSION=latest +FROM cometbft/cometbft:${COMETBFT_VERSION} COPY tm-signer-harness /usr/bin/tm-signer-harness diff --git a/tools/tm-signer-harness/Makefile b/tools/tm-signer-harness/Makefile index 1c404ebf8..b43a7f448 100644 --- a/tools/tm-signer-harness/Makefile +++ b/tools/tm-signer-harness/Makefile @@ -1,6 +1,6 @@ .PHONY: build install docker-image -TENDERMINT_VERSION?=latest +COMETBFT_VERSION?=latest BUILD_TAGS?='tendermint' VERSION := $(shell git describe --always) BUILD_FLAGS = -ldflags "-X github.com/tendermint/tendermint/version.TMCoreSemVer=$(VERSION) @@ -16,6 +16,6 @@ install: docker-image: GOOS=linux GOARCH=amd64 go build $(BUILD_FLAGS) -tags $(BUILD_TAGS) -o tm-signer-harness main.go docker build \ - --build-arg TENDERMINT_VERSION=$(TENDERMINT_VERSION) \ - -t tendermint/tm-signer-harness:$(TENDERMINT_VERSION) . + --build-arg COMETBFT_VERSION=$(COMETBFT_VERSION) \ + -t tendermint/tm-signer-harness:$(COMETBFT_VERSION) . rm -rf tm-signer-harness