Skip to content

Commit

Permalink
Merge pull request ethereum#91 from tomochain/feature/bootnodeimage
Browse files Browse the repository at this point in the history
Add new pipeline for bootnode binary
  • Loading branch information
ngtuna authored Jul 26, 2018
2 parents b28c4af + 2ab1821 commit f807412
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 35 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- while sleep 540; do echo "[ still running ]"; done &
- go run build/ci.go test -coverage
- kill %1
- stage: Build and push Docker image
- stage: Build and push tomochain/tomochain and tomochain/bootnode containers
services:
- docker
before_install:
Expand All @@ -49,7 +49,7 @@ jobs:
script: bash docker_push.sh
on:
branch: master
- stage: Trigger rebuild of infrastructure image
- stage: Trigger rebuild of tomochain/infra-tomochain image
sudo: false
script: bash docker_rebuild.sh

Expand Down
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ RUN chmod +x /usr/local/bin/tomo
EXPOSE 8545
EXPOSE 30303

ENTRYPOINT ["/usr/local/bin/tomo", "--help"]
ENTRYPOINT ["/usr/local/bin/tomo"]

CMD ["--help"]
22 changes: 22 additions & 0 deletions Dockerfile.bootnode
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM golang:1.10-alpine as builder

RUN apk add --no-cache make gcc musl-dev linux-headers

ADD . /tomochain
RUN cd /tomochain && make bootnode

FROM alpine:latest

LABEL maintainer="[email protected]"

WORKDIR /tomochain

COPY --from=builder /tomochain/build/bin/bootnode /usr/local/bin/bootnode

RUN chmod +x /usr/local/bin/bootnode

EXPOSE 30301

ENTRYPOINT ["/usr/local/bin/bootnode"]

CMD ["--help"]
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ tomo:
@echo "Done building."
@echo "Run \"$(GOBIN)/tomo\" to launch tomo."

bootnode:
build/env.sh go run build/ci.go install ./cmd/bootnode
@echo "Done building."
@echo "Run \"$(GOBIN)/bootnode\" to launch a bootnode."

swarm:
build/env.sh go run build/ci.go install ./cmd/swarm
@echo "Done building."
Expand Down
32 changes: 0 additions & 32 deletions circle.yml

This file was deleted.

0 comments on commit f807412

Please sign in to comment.