From ae45563e713f1e02b86a508c07cee17b915b1f71 Mon Sep 17 00:00:00 2001
From: Silas Davis <silas@monax.io>
Date: Wed, 18 Jul 2018 18:16:34 +0100
Subject: [PATCH] Update CI image and add commands to Makefile
Signed-off-by: Silas Davis <silas@monax.io>
---
.circleci/Dockerfile | 4 ++--
Dockerfile | 12 ++++++------
Makefile | 14 +++++++++++++-
rpc/config.go | 2 +-
4 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile
index 62926585..b5e2b325 100644
--- a/.circleci/Dockerfile
+++ b/.circleci/Dockerfile
@@ -1,11 +1,11 @@
# docker build -t quay.io/monax/build:burrow-ci .
-FROM golang:1.10.1-alpine3.7
+FROM golang:1.10.3-alpine3.8
MAINTAINER Monax <support@monax.io>
ENV DOCKER_VERSION "17.12.1-ce"
# This is the image used by the Circle CI config in this directory pushed to quay.io/monax/bosmarmot:ci
# docker build -t quay.io/monax/build:burrow-ci -f ./.circleci/Dockerfile .
-RUN apk add --update --no-cache nodejs netcat-openbsd git openssh-client openssl make bash gcc g++ jq curl
+RUN apk add --update --no-cache nodejs npm netcat-openbsd git openssh-client openssl make bash gcc g++ jq curl
# get docker client
RUN curl -L -o /tmp/docker-$DOCKER_VERSION.tgz https://download.docker.com/linux/static/stable/x86_64/docker-$DOCKER_VERSION.tgz \
&& tar -xz -C /tmp -f /tmp/docker-$DOCKER_VERSION.tgz \
diff --git a/Dockerfile b/Dockerfile
index edb83bbc..77186ef5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
# We use a multistage build to avoid bloating our deployment image with build dependencies
-FROM golang:1.10.1-alpine3.7 as builder
+FROM golang:1.10.3-alpine3.8 as builder
MAINTAINER Monax <support@monax.io>
RUN apk add --no-cache --update git bash make
@@ -12,7 +12,7 @@ WORKDIR $REPO
RUN make build
# This will be our base container image
-FROM alpine:3.7
+FROM alpine:3.8
ARG REPO=/go/src/github.com/hyperledger/burrow
@@ -26,9 +26,9 @@ USER $USER:$USER
COPY --from=builder $REPO/bin/* /usr/local/bin/
#RUN chown $USER:$USER /usr/local/bin/burrow*
-# Expose ports for 1337:burrow API; 46656:tendermint-peer; 46657:tendermint-rpc
-EXPOSE 1337
-EXPOSE 46656
-EXPOSE 46657
+# Expose ports for 26656:tendermint-peer; 26658: tm; 10997 GRPC
+EXPOSE 26656
+EXPOSE 26658
+EXPOSE 10997
CMD [ "burrow" ]
diff --git a/Makefile b/Makefile
index ffa4a8d4..fcc9956d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@
# REQUIREMENTS
# - go installed locally
-# - for build_docker: docker installed locally
# ----------------------------------------------------------
@@ -24,6 +23,8 @@ PROTO_GO_FILES_REAL = $(shell find . -path ./vendor -prune -o -type f -name '*.p
SOLIDITY_FILES = $(shell find . -path ./vendor -prune -o -type f -name '*.sol' -print)
SOLIDITY_GO_FILES = $(patsubst %.sol, %.sol.go, $(SOLIDITY_FILES))
+CI_IMAGE="quay.io/monax/build:burrow-ci"
+
### Formatting, linting and vetting
# check the code for style standards; currently enforces go formatting.
@@ -230,3 +231,14 @@ docs: CHANGELOG.md NOTES.md
tag_release: test check CHANGELOG.md NOTES.md build
@scripts/tag_release.sh
+.PHONY: docker_build_ci_rebuild
+docker_build_ci_rebuild:
+ docker build --no-cache -t ${CI_IMAGE} -f ./.circleci/Dockerfile .
+
+.PHONY: docker_build_ci
+docker_build_ci:
+ docker build -t ${CI_IMAGE} -f ./.circleci/Dockerfile .
+
+.PHONY: docker_push_ci
+docker_push_ci: docker_build_ci
+ docker push ${CI_IMAGE}
diff --git a/rpc/config.go b/rpc/config.go
index ef509581..44acb555 100644
--- a/rpc/config.go
+++ b/rpc/config.go
@@ -41,7 +41,7 @@ func DefaultRPCConfig() *RPCConfig {
func DefaultTMConfig() *ServerConfig {
return &ServerConfig{
Enabled: true,
- ListenAddress: "tcp://localhost:46657",
+ ListenAddress: "tcp://localhost:26658",
}
}
--
GitLab