This repository has been archived by the owner on May 13, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 346
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #839 from hyperledger/develop
Release 0.20.0
- Loading branch information
Showing
865 changed files
with
58,166 additions
and
102,149 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
# docker build -t quay.io/monax/burrow:ci . | ||
FROM golang:1.10.1-alpine3.7 | ||
# docker build -t quay.io/monax/build:burrow-ci . | ||
FROM golang:1.10.3-alpine3.8 | ||
MAINTAINER Monax <[email protected]> | ||
|
||
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/burrow:ci -f ./.circleci/Dockerfile . | ||
RUN apk add --update --no-cache nodejs netcat-openbsd git openssh-client openssl make bash gcc g++ jq curl | ||
# docker build -t quay.io/monax/build:burrow-ci -f ./.circleci/Dockerfile . | ||
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 \ | ||
|
@@ -14,4 +14,4 @@ RUN curl -L -o /tmp/docker-$DOCKER_VERSION.tgz https://download.docker.com/linux | |
RUN go get github.com/jstemmer/go-junit-report | ||
RUN go get -u github.com/golang/dep/cmd/dep | ||
RUN npm install -g mocha | ||
RUN npm install -g mocha-circleci-reporter | ||
RUN npm install -g mocha-circleci-reporter |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 <[email protected]> | ||
|
||
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" ] |
Oops, something went wrong.