From a13a4b8c77db12d088c5e5ccc50451814748ed50 Mon Sep 17 00:00:00 2001 From: Marko Date: Mon, 7 Oct 2019 17:34:24 +0200 Subject: [PATCH] remove traces of `github.com/tendermint/abci` (#4038) * Remove traces oaf `github.com/tendermint/abci` - removed abci dockerfile as it was still referencing `github.com/tendermint/abci` Signed-off-by: Marko Baricevic * nor change to install of abci * use abci-cli instead of tendermint node * remove traces of Dockerfile.develop also use latest Go in Dockerfile.testing * update docker readme * remove wrapping because it will look awful on docker hub --- DOCKER/Dockerfile | 1 - DOCKER/Dockerfile.abci | 23 ---------------- DOCKER/Dockerfile.testing | 4 +-- DOCKER/Makefile | 8 +----- DOCKER/README.md | 26 +++++++------------ .../examples/counter/app.yaml | 4 +-- 6 files changed, 13 insertions(+), 53 deletions(-) delete mode 100644 DOCKER/Dockerfile.abci diff --git a/DOCKER/Dockerfile b/DOCKER/Dockerfile index 6a7f289f5..c3c186e05 100644 --- a/DOCKER/Dockerfile +++ b/DOCKER/Dockerfile @@ -36,4 +36,3 @@ STOPSIGNAL SIGTERM ARG BINARY=tendermint COPY $BINARY /usr/bin/tendermint - diff --git a/DOCKER/Dockerfile.abci b/DOCKER/Dockerfile.abci deleted file mode 100644 index 52a3d9e0b..000000000 --- a/DOCKER/Dockerfile.abci +++ /dev/null @@ -1,23 +0,0 @@ -FROM golang:latest - -RUN mkdir -p /go/src/github.com/tendermint/abci -WORKDIR /go/src/github.com/tendermint/abci - -COPY Makefile /go/src/github.com/tendermint/abci/ - -# see make protoc for details on ldconfig -RUN make get_protoc && ldconfig - -# killall is used in tests -RUN apt-get update && apt-get install -y \ - psmisc \ - && rm -rf /var/lib/apt/lists/* - -COPY Gopkg.toml /go/src/github.com/tendermint/abci/ -COPY Gopkg.lock /go/src/github.com/tendermint/abci/ -RUN make tools - -# see https://github.com/golang/dep/issues/1312 -RUN dep ensure -vendor-only - -COPY . /go/src/github.com/tendermint/abci diff --git a/DOCKER/Dockerfile.testing b/DOCKER/Dockerfile.testing index a658aeb10..7f86ee180 100644 --- a/DOCKER/Dockerfile.testing +++ b/DOCKER/Dockerfile.testing @@ -1,5 +1,4 @@ -FROM golang:1.12 - +FROM golang:latest # Grab deps (jq, hexdump, xxd, killall) RUN apt-get update && \ @@ -15,4 +14,3 @@ VOLUME /go EXPOSE 26656 EXPOSE 26657 - diff --git a/DOCKER/Makefile b/DOCKER/Makefile index 41fb60ac8..8f6dff372 100644 --- a/DOCKER/Makefile +++ b/DOCKER/Makefile @@ -4,16 +4,10 @@ build: push: @sh -c "'$(CURDIR)/push.sh'" -build_develop: - docker build -t "tendermint/tendermint:develop" -f Dockerfile.develop . - build_testing: docker build --tag tendermint/testing -f ./Dockerfile.testing . -push_develop: - docker push "tendermint/tendermint:develop" - build_amazonlinux_buildimage: docker build -t "tendermint/tendermint:build_c-amazonlinux" -f Dockerfile.build_c-amazonlinux . -.PHONY: build build_develop push push_develop +.PHONY: build push build_testing build_amazonlinux_buildimage diff --git a/DOCKER/README.md b/DOCKER/README.md index 57e631aaa..775922248 100644 --- a/DOCKER/README.md +++ b/DOCKER/README.md @@ -2,27 +2,19 @@ ## Supported tags and respective `Dockerfile` links -- `0.17.1`, `latest` [(Dockerfile)](https://github.com/tendermint/tendermint/blob/208ac32fa266657bd6c304e84ec828aa252bb0b8/DOCKER/Dockerfile) -- `0.15.0` [(Dockerfile)](https://github.com/tendermint/tendermint/blob/170777300ea92dc21a8aec1abc16cb51812513a4/DOCKER/Dockerfile) -- `0.13.0` [(Dockerfile)](https://github.com/tendermint/tendermint/blob/a28b3fff49dce2fb31f90abb2fc693834e0029c2/DOCKER/Dockerfile) -- `0.12.1` [(Dockerfile)](https://github.com/tendermint/tendermint/blob/457c688346b565e90735431619ca3ca597ef9007/DOCKER/Dockerfile) -- `0.12.0` [(Dockerfile)](https://github.com/tendermint/tendermint/blob/70d8afa6e952e24c573ece345560a5971bf2cc0e/DOCKER/Dockerfile) -- `0.11.0` [(Dockerfile)](https://github.com/tendermint/tendermint/blob/9177cc1f64ca88a4a0243c5d1773d10fba67e201/DOCKER/Dockerfile) -- `0.10.0` [(Dockerfile)](https://github.com/tendermint/tendermint/blob/e5342f4054ab784b2cd6150e14f01053d7c8deb2/DOCKER/Dockerfile) -- `0.9.1`, `0.9`, [(Dockerfile)](https://github.com/tendermint/tendermint/blob/809e0e8c5933604ba8b2d096803ada7c5ec4dfd3/DOCKER/Dockerfile) -- `0.9.0` [(Dockerfile)](https://github.com/tendermint/tendermint/blob/d474baeeea6c22b289e7402449572f7c89ee21da/DOCKER/Dockerfile) -- `0.8.0`, `0.8` [(Dockerfile)](https://github.com/tendermint/tendermint/blob/bf64dd21fdb193e54d8addaaaa2ecf7ac371de8c/DOCKER/Dockerfile) +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. -## Quick reference +Official releases can be found [here](https://github.com/tendermint/tendermint/releases). + +The Dockerfile for tendermint is not expected to change in the near future. The master file used for all builds can be found [here](https://raw.githubusercontent.com/tendermint/tendermint/master/DOCKER/Dockerfile). -- **Where to get help:** - [cosmos.network/ecosystem](https://cosmos.network/ecosystem) +Respective versioned files can be found https://raw.githubusercontent.com/tendermint/tendermint/vX.XX.XX/DOCKER/Dockerfile (replace the Xs with the version number). -- **Where to file issues:** - [Tendermint Issues](https://github.com/tendermint/tendermint/issues) +## Quick reference -- **Supported Docker versions:** - [the latest release](https://github.com/moby/moby/releases) (down to 1.6 on a best-effort basis) +- **Where to get help:** https://tendermint.com/ +- **Where to file issues:** https://github.com/tendermint/tendermint/issues +- **Supported Docker versions:** [the latest release](https://github.com/moby/moby/releases) (down to 1.6 on a best-effort basis) ## Tendermint diff --git a/tools/mintnet-kubernetes/examples/counter/app.yaml b/tools/mintnet-kubernetes/examples/counter/app.yaml index fed35f102..4565f9764 100644 --- a/tools/mintnet-kubernetes/examples/counter/app.yaml +++ b/tools/mintnet-kubernetes/examples/counter/app.yaml @@ -163,11 +163,11 @@ spec: - | set -ex - go get github.com/tendermint/abci/cmd/counter + go get github.com/tendermint/tendermint/abci/cmd/abci-cli rm -f /socks/app.sock # remove old socket - counter --serial --addr="unix:///socks/app.sock" + abci-cli counter --serial=true --address="unix:///socks/app.sock" volumeMounts: - name: socksdir mountPath: /socks