Skip to content

Commit a13a4b8

Browse files
tac0turtlemelekes
authored andcommittedOct 7, 2019
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 <[email protected]> * 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
1 parent 38359f4 commit a13a4b8

File tree

6 files changed

+13
-53
lines changed

6 files changed

+13
-53
lines changed
 

‎DOCKER/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,3 @@ STOPSIGNAL SIGTERM
3636

3737
ARG BINARY=tendermint
3838
COPY $BINARY /usr/bin/tendermint
39-

‎DOCKER/Dockerfile.abci

-23
This file was deleted.

‎DOCKER/Dockerfile.testing

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
FROM golang:1.12
2-
1+
FROM golang:latest
32

43
# Grab deps (jq, hexdump, xxd, killall)
54
RUN apt-get update && \
@@ -15,4 +14,3 @@ VOLUME /go
1514

1615
EXPOSE 26656
1716
EXPOSE 26657
18-

‎DOCKER/Makefile

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,10 @@ build:
44
push:
55
@sh -c "'$(CURDIR)/push.sh'"
66

7-
build_develop:
8-
docker build -t "tendermint/tendermint:develop" -f Dockerfile.develop .
9-
107
build_testing:
118
docker build --tag tendermint/testing -f ./Dockerfile.testing .
129

13-
push_develop:
14-
docker push "tendermint/tendermint:develop"
15-
1610
build_amazonlinux_buildimage:
1711
docker build -t "tendermint/tendermint:build_c-amazonlinux" -f Dockerfile.build_c-amazonlinux .
1812

19-
.PHONY: build build_develop push push_develop
13+
.PHONY: build push build_testing build_amazonlinux_buildimage

‎DOCKER/README.md

+9-17
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,19 @@
22

33
## Supported tags and respective `Dockerfile` links
44

5-
- `0.17.1`, `latest` [(Dockerfile)](https://github.com/tendermint/tendermint/blob/208ac32fa266657bd6c304e84ec828aa252bb0b8/DOCKER/Dockerfile)
6-
- `0.15.0` [(Dockerfile)](https://github.com/tendermint/tendermint/blob/170777300ea92dc21a8aec1abc16cb51812513a4/DOCKER/Dockerfile)
7-
- `0.13.0` [(Dockerfile)](https://github.com/tendermint/tendermint/blob/a28b3fff49dce2fb31f90abb2fc693834e0029c2/DOCKER/Dockerfile)
8-
- `0.12.1` [(Dockerfile)](https://github.com/tendermint/tendermint/blob/457c688346b565e90735431619ca3ca597ef9007/DOCKER/Dockerfile)
9-
- `0.12.0` [(Dockerfile)](https://github.com/tendermint/tendermint/blob/70d8afa6e952e24c573ece345560a5971bf2cc0e/DOCKER/Dockerfile)
10-
- `0.11.0` [(Dockerfile)](https://github.com/tendermint/tendermint/blob/9177cc1f64ca88a4a0243c5d1773d10fba67e201/DOCKER/Dockerfile)
11-
- `0.10.0` [(Dockerfile)](https://github.com/tendermint/tendermint/blob/e5342f4054ab784b2cd6150e14f01053d7c8deb2/DOCKER/Dockerfile)
12-
- `0.9.1`, `0.9`, [(Dockerfile)](https://github.com/tendermint/tendermint/blob/809e0e8c5933604ba8b2d096803ada7c5ec4dfd3/DOCKER/Dockerfile)
13-
- `0.9.0` [(Dockerfile)](https://github.com/tendermint/tendermint/blob/d474baeeea6c22b289e7402449572f7c89ee21da/DOCKER/Dockerfile)
14-
- `0.8.0`, `0.8` [(Dockerfile)](https://github.com/tendermint/tendermint/blob/bf64dd21fdb193e54d8addaaaa2ecf7ac371de8c/DOCKER/Dockerfile)
5+
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.
156

16-
## Quick reference
7+
Official releases can be found [here](https://github.com/tendermint/tendermint/releases).
8+
9+
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).
1710

18-
- **Where to get help:**
19-
[cosmos.network/ecosystem](https://cosmos.network/ecosystem)
11+
Respective versioned files can be found https://raw.githubusercontent.com/tendermint/tendermint/vX.XX.XX/DOCKER/Dockerfile (replace the Xs with the version number).
2012

21-
- **Where to file issues:**
22-
[Tendermint Issues](https://github.com/tendermint/tendermint/issues)
13+
## Quick reference
2314

24-
- **Supported Docker versions:**
25-
[the latest release](https://github.com/moby/moby/releases) (down to 1.6 on a best-effort basis)
15+
- **Where to get help:** https://tendermint.com/
16+
- **Where to file issues:** https://github.com/tendermint/tendermint/issues
17+
- **Supported Docker versions:** [the latest release](https://github.com/moby/moby/releases) (down to 1.6 on a best-effort basis)
2618

2719
## Tendermint
2820

‎tools/mintnet-kubernetes/examples/counter/app.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,11 @@ spec:
163163
- |
164164
set -ex
165165
166-
go get github.com/tendermint/abci/cmd/counter
166+
go get github.com/tendermint/tendermint/abci/cmd/abci-cli
167167
168168
rm -f /socks/app.sock # remove old socket
169169
170-
counter --serial --addr="unix:///socks/app.sock"
170+
abci-cli counter --serial=true --address="unix:///socks/app.sock"
171171
volumeMounts:
172172
- name: socksdir
173173
mountPath: /socks

0 commit comments

Comments
 (0)
Please sign in to comment.