From e2fe4a6e9b4c9205dfc0bdf1c7d17b3b491fd951 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Mon, 26 Jun 2017 10:57:46 +0400 Subject: [PATCH 1/6] [docker] bump alpine version [ci skip] --- DOCKER/Dockerfile | 2 +- DOCKER/Dockerfile.develop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DOCKER/Dockerfile b/DOCKER/Dockerfile index 09b25f732..98a1db4e7 100644 --- a/DOCKER/Dockerfile +++ b/DOCKER/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.5 +FROM alpine:3.6 # This is the release of tendermint to pull in. ENV TM_VERSION 0.10.0 diff --git a/DOCKER/Dockerfile.develop b/DOCKER/Dockerfile.develop index 82cd884ae..2ffb68281 100644 --- a/DOCKER/Dockerfile.develop +++ b/DOCKER/Dockerfile.develop @@ -1,4 +1,4 @@ -FROM alpine:3.5 +FROM alpine:3.6 ENV DATA_ROOT /tendermint ENV TMHOME $DATA_ROOT From 24a1b130f9ff32704c5b2d8d508db70123ce60a0 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Mon, 26 Jun 2017 10:58:19 +0400 Subject: [PATCH 2/6] [docker] build and push scripts [ci skip] --- DOCKER/Makefile | 8 ++------ DOCKER/build.sh | 20 ++++++++++++++++++++ DOCKER/push.sh | 22 ++++++++++++++++++++++ 3 files changed, 44 insertions(+), 6 deletions(-) create mode 100755 DOCKER/build.sh create mode 100755 DOCKER/push.sh diff --git a/DOCKER/Makefile b/DOCKER/Makefile index 612b9a694..10c972502 100644 --- a/DOCKER/Makefile +++ b/DOCKER/Makefile @@ -1,12 +1,8 @@ build: - # TAG=0.8.0 TAG_NO_PATCH=0.8 - docker build -t "tendermint/tendermint" -t "tendermint/tendermint:$(TAG)" -t "tendermint/tendermint:$(TAG_NO_PATCH)" . + @sh -c "'$(CURDIR)/build.sh'" push: - # TAG=0.8.0 TAG_NO_PATCH=0.8 - docker push "tendermint/tendermint:latest" - docker push "tendermint/tendermint:$(TAG)" - docker push "tendermint/tendermint:$(TAG_NO_PATCH)" + @sh -c "'$(CURDIR)/push.sh'" build_develop: docker build -t "tendermint/tendermint:develop" -f Dockerfile.develop . diff --git a/DOCKER/build.sh b/DOCKER/build.sh new file mode 100755 index 000000000..ee617cc63 --- /dev/null +++ b/DOCKER/build.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash +set -e + +# Get the tag from the version, or try to figure it out. +if [ -z "$TAG" ]; then + TAG=$(awk -F\" '/Version =/ { print $2; exit }' < ../version/version.go) +fi +if [ -z "$TAG" ]; then + echo "Please specify a tag." + exit 1 +fi + +TAG_NO_PATCH=${TAG%.*} + +read -p "==> Build 3 docker images with the following tags (latest, $TAG, $TAG_NO_PATCH)? y/n" -n 1 -r +echo +if [[ $REPLY =~ ^[Yy]$ ]] +then + docker build -t "tendermint/tendermint" -t "tendermint/tendermint:$TAG" -t "tendermint/tendermint:$TAG_NO_PATCH" . +fi diff --git a/DOCKER/push.sh b/DOCKER/push.sh new file mode 100755 index 000000000..32741dce8 --- /dev/null +++ b/DOCKER/push.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash +set -e + +# Get the tag from the version, or try to figure it out. +if [ -z "$TAG" ]; then + TAG=$(awk -F\" '/Version =/ { print $2; exit }' < ../version/version.go) +fi +if [ -z "$TAG" ]; then + echo "Please specify a tag." + exit 1 +fi + +TAG_NO_PATCH=${TAG%.*} + +read -p "==> Push 3 docker images with the following tags (latest, $TAG, $TAG_NO_PATCH)? y/n" -n 1 -r +echo +if [[ $REPLY =~ ^[Yy]$ ]] +then + docker push "tendermint/tendermint:latest" + docker push "tendermint/tendermint:$TAG" + docker push "tendermint/tendermint:$TAG_NO_PATCH" +fi From 9a80730f38b9aa99157bf8f9f3ab3767d25b5bf4 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Mon, 26 Jun 2017 11:09:24 +0400 Subject: [PATCH 3/6] [docker] fix link to 0.10.0 Dockerfile [ci skip] --- DOCKER/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DOCKER/README.md b/DOCKER/README.md index 2bd2b27ea..d8e78396b 100644 --- a/DOCKER/README.md +++ b/DOCKER/README.md @@ -1,6 +1,6 @@ # Supported tags and respective `Dockerfile` links -- `0.10.0`, `latest` [(Dockerfile)](https://github.com/tendermint/tendermint/blob/v0.10.0/DOCKER/Dockerfile) +- `0.10.0`, `latest` [(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) From 852375be00debf61577d4eb54146c37fecc497e9 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Mon, 26 Jun 2017 11:17:50 +0400 Subject: [PATCH 4/6] [docker] update link to mintnet-k8s [ci skip] --- DOCKER/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DOCKER/README.md b/DOCKER/README.md index d8e78396b..b3afa481d 100644 --- a/DOCKER/README.md +++ b/DOCKER/README.md @@ -29,7 +29,7 @@ docker run -it --rm -v "/tmp:/tendermint" tendermint/tendermint ## mintnet-kubernetes -If you want to see many containers talking to each other, consider using [mintnet-kubernetes](https://github.com/tendermint/mintnet-kubernetes), which is a tool for running Tendermint-based applications on a Kubernetes cluster. +If you want to see many containers talking to each other, consider using [mintnet-kubernetes](https://github.com/tendermint/tools/tree/master/mintnet-kubernetes), which is a tool for running Tendermint-based applications on a Kubernetes cluster. # Supported Docker versions From aa7b3a73f52fca7a7332b8977a6570a9651cd646 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Mon, 26 Jun 2017 12:05:08 +0400 Subject: [PATCH 5/6] [docker] remove dummy app as default [ci skip] --- DOCKER/Dockerfile | 3 +-- DOCKER/README.md | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/DOCKER/Dockerfile b/DOCKER/Dockerfile index 98a1db4e7..55f2e14ab 100644 --- a/DOCKER/Dockerfile +++ b/DOCKER/Dockerfile @@ -42,5 +42,4 @@ EXPOSE 46657 ENTRYPOINT ["tendermint"] -# By default you'll get the dummy app -CMD ["node", "--moniker=`hostname`", "--proxy_app=dummy"] +CMD ["node", "--moniker=`hostname`"] diff --git a/DOCKER/README.md b/DOCKER/README.md index b3afa481d..e191abc39 100644 --- a/DOCKER/README.md +++ b/DOCKER/README.md @@ -24,7 +24,7 @@ A very simple example of a built-in app and Tendermint core in one container. ``` docker run -it --rm -v "/tmp:/tendermint" tendermint/tendermint init -docker run -it --rm -v "/tmp:/tendermint" tendermint/tendermint +docker run -it --rm -v "/tmp:/tendermint" tendermint/tendermint node --proxy_app=dummy ``` ## mintnet-kubernetes From d0b1bf4e26b6aadb2fc9dc04cf28cfc8a70246f6 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Mon, 26 Jun 2017 12:08:38 +0400 Subject: [PATCH 6/6] [docker] bump golang version to 1.8.3 --- scripts/tendermint-builder/Dockerfile | 2 +- test/docker/Dockerfile | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/tendermint-builder/Dockerfile b/scripts/tendermint-builder/Dockerfile index 84c198ee0..daf931715 100644 --- a/scripts/tendermint-builder/Dockerfile +++ b/scripts/tendermint-builder/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.7.4 +FROM golang:1.8.3 RUN apt-get update && apt-get install -y --no-install-recommends \ zip \ diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile index 7c322976d..8a2702fc8 100644 --- a/test/docker/Dockerfile +++ b/test/docker/Dockerfile @@ -1,5 +1,4 @@ -# Pull base image. -FROM golang:1.7.4 +FROM golang:1.8.3 # Add testing deps for curl RUN echo 'deb http://httpredir.debian.org/debian testing main non-free contrib' >> /etc/apt/sources.list @@ -9,7 +8,7 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends \ jq bsdmainutils vim-common psmisc netcat curl -# Setup tendermint repo +# Setup tendermint repo ENV REPO $GOPATH/src/github.com/tendermint/tendermint WORKDIR $REPO