Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: seatgeek/nomad-firehose
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 860cc6f1327ecfe9161b23e55f989205601dbff0
Choose a base ref
..
head repository: seatgeek/nomad-firehose
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1b26c2c8a6167f35e43d8ec566fee48f1aefc1ab
Choose a head ref
Showing with 619 additions and 995 deletions.
  1. +2 −15 .travis.yml
  2. +13 −10 Dockerfile
  3. +503 −0 Gopkg.lock
  4. +70 −0 Gopkg.toml
  5. +7 −12 Makefile
  6. +1 −1 README.md
  7. +1 −1 command/allocations/app.go
  8. +1 −1 command/deployments/app.go
  9. +1 −1 command/evaluations/app.go
  10. +1 −1 command/jobs/job.go
  11. +1 −1 command/jobs/jobsliststub.go
  12. +0 −5 entrypoint.sh
  13. +14 −4 helper/manager.go
  14. +4 −1 main.go
  15. +0 −5 sink/http.go
  16. +0 −5 sink/kafka.go
  17. +0 −5 sink/kinesis.go
  18. +0 −5 sink/mongodb.go
  19. +0 −5 sink/nsq.go
  20. +0 −5 sink/rabbitmq.go
  21. +0 −5 sink/redis.go
  22. +0 −6 sink/stdout.go
  23. +0 −1 sink/structs.go
  24. +0 −900 vendor/vendor.json
17 changes: 2 additions & 15 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -3,36 +3,23 @@ sudo: required
language: go

go:
- 1.9
- 1.11.2

services:
- docker

cache:
directories:
- vendor/github.com
- vendor/go4.org
- vendor/golang.org
- vendor/gopkg.in
- vendor/

env:
global:
- CGO_ENABLED=0
- GOBUILD="linux-amd64 windows-amd64 darwin-amd64"
- secure: "LRLyC0QgD1twHWmYR4ppX/Ds6K2/1x+gLy0vuRzCmfd8NcPf0mbqx3e9spETLcYzOnoL25FCCLSQoeKlhHLQx9iAmXe7KA825WnaGiOBwYjXo9X2Y+nFlwf+h3QtR28y1EhbKlGFT8UPZxKUGuy9xemjjqUo8DVxcj77VTreTdUbGaIWXZjBPjA/md7t7bnTzCe3q79j+KFvq6S84dNdZaRXBO1M4MpnH/4JlvDVp8k+hEEg+Dp3ru0JayRgbMdfHGTMuia/BmMJqBpVeGaf/GraGAeJwGsQdbo65AXrySovwn+u22mFN2Hv36IE/66Rs/AkPY/BdDbKNDPHSv1vIIJbRh6HSnro6ZVX+XyOG1nFd4BhDRY6AhNDphNro7olvIyG4krw5q72uAy9n+fbHH8A5ZeQ6Nk4iu9JnVOBtWoomisdlHov8ljlbiAGCUtyjR6iJVc8Z1xZaCCw+XBK21YIAE2tPjcuTkZnCf4EXM2Al/VlINCal32DBFB+HC8x/WqGPon/qcBMfw3gi6cFEUFY7farZBT5sl6S7IqNLKeLO6ZkU2maOnhQoek0o8DxJQf+/1MwT54RMMu2zpj5KLO4CnXIJy3hqiUKWhJN9mOIRz7DtjP90Qx1AHrgmkUFGxFq53xwbxrvfT7cZ0NqkxRLQ3INewuNxKjxO9TcX6E="
- secure: "ETF+/7ajz108xX2OPds+uFiJQKQoKIs/jiOuo9OLbyS6SeGmqlu5ogO+qnOjbMwt9phmIBWP9O7HGo4xpO6jDg5bR5GR8MoUEXss+pP1eigDE5T+wJVrW15YRHv3nbCj6nOtMzI0wiPDdfJxa1DAPc1cAVDA9wqaSu0JC519Ox/dVPDUxpXVlkeI2BoLPNpfjNXYkL3jnKJq5JeIA6ZtCFvKSw9jaCldCA906h5JW5KHLRdH27SM9fI/dL8hQ3obTylSAM8lDhTtD1kW4+kXrDLEUplH3t72/2ViOyzrlq7o2PbAhtJwtM4pIGZOZMyHkP9G5SI8EFf8/kZ2UzGTzteL3kk6g6vXgnHyNBC1IMWXSlWtY9Ti8M0Icx88DlAWVENW9I0zVElJBeUPRSkH08Qt77DIBhmS+rwCpGIGNtNep87qtOSXHXyEXu9ibQiGeujHZ3SO5QF7uBcHgAkFnerxjsr5cfzVVJBFP13BNcRERSlSQBLmXTUIs/loVG6qSN/1wjNM5rPRVTVpIh3IR3o6ZlNDyNgr7KOvtMb1obQdTsqoG57H1NsU7TblKmffe1Unh8+EheiG42TAfG1zPphyk0q83JUqIE9JrWu/UfDEknnuty0T6kVCfzGfjkM5kF9KqfW9b8/ndxLJV8Fv25Y7okcPaoZ5WHRiASRUe0o="

script:
- GOBUILD=${GOBUILD} make -j dist
- ls -la build

after_success:
- export PR=https://api.github.com/repos/$TRAVIS_REPO_SLUG/pulls/$TRAVIS_PULL_REQUEST
- export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo `curl -s $PR | jq -r .head.ref`; fi)
- if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then make -j docker DOCKER_USER=$DOCKER_USER DOCKER_PASS=$DOCKER_PASS TAG=pr-$TRAVIS_PULL_REQUEST COMMIT=$TRAVIS_COMMIT; fi
- if [[ "$TRAVIS_TAG" =~ ^v.*$ ]]; then make -j docker DOCKER_USER=$DOCKER_USER DOCKER_PASS=$DOCKER_PASS TAG=$TRAVIS_TAG COMMIT=$TRAVIS_COMMIT; fi
- if [[ "$BRANCH" == "master" ]]; then make -j docker DOCKER_USER=$DOCKER_USER DOCKER_PASS=$DOCKER_PASS TAG=latest COMMIT=$TRAVIS_COMMIT; fi

deploy:
provider: releases
api_key:
23 changes: 13 additions & 10 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
FROM alpine
FROM golang:1.11-alpine

# we need ca-certificates for any external https communication
RUN apk --update upgrade && \
apk add curl ca-certificates && \
update-ca-certificates && \
rm -rf /var/cache/apk/*
# Adding ca-certificates for external communication and git for dep installation
RUN apk add --update ca-certificates git \
&& rm -rf /var/cache/apk/*

ADD ./build/nomad-firehose-linux-amd64 /bin/nomad-firehose
ADD ./entrypoint.sh /entrypoint.sh
RUN go get -u github.com/golang/dep/cmd/dep
WORKDIR /go/src/github.com/seatgeek/nomad-firehose/
COPY . /go/src/github.com/seatgeek/nomad-firehose/
RUN dep ensure
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o build/nomad-firehose -ldflags "-X main.GitCommit=$(git describe --tags)"

CMD /bin/nomad-firehose
ENTRYPOINT ["/entrypoint.sh"]
FROM alpine:latest
RUN apk --no-cache add ca-certificates
COPY --from=0 /go/src/github.com/seatgeek/nomad-firehose/build/nomad-firehose /usr/local/bin/
CMD [ "nomad-firehose" ]
Loading