Skip to content

Commit

Permalink
Ingester binaries & Docker (#1086)
Browse files Browse the repository at this point in the history
* Publish Docker and artifacts for Ingester

Signed-off-by: Louis-Etienne Dorval <louis-etienne.dorval@ticketmaster.com>

* Support building just the ingester

Signed-off-by: William Stewart <zoidbergwill@gmail.com>
  • Loading branch information
ledor473 authored and pavolloffay committed Sep 28, 2018
1 parent d73db1e commit f441f1d
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ cmd/agent/agent
cmd/agent/agent-linux
cmd/collector/collector
cmd/collector/collector-linux
cmd/ingester/ingester
cmd/ingester/ingester-linux
cmd/query/query
cmd/query/query-linux
crossdock/crossdock-linux
Expand Down
10 changes: 7 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,10 @@ build-query:
build-collector:
CGO_ENABLED=0 installsuffix=cgo go build -o ./cmd/collector/collector-$(GOOS) $(BUILD_INFO) ./cmd/collector/main.go

.PHONY: build-ingester
build-ingester:
CGO_ENABLED=0 installsuffix=cgo go build -o ./cmd/ingester/ingester-$(GOOS) $(BUILD_INFO) ./cmd/ingester/main.go

.PHONY: docker-no-ui
docker-no-ui: build-binaries-linux build-crossdock-linux
make docker-images-only
Expand All @@ -218,7 +222,7 @@ build-binaries-darwin:
GOOS=darwin $(MAKE) build-platform-binaries

.PHONY: build-platform-binaries
build-platform-binaries: build-agent build-collector build-query build-all-in-one build-examples
build-platform-binaries: build-agent build-collector build-query build-ingester build-all-in-one build-examples

.PHONY: build-all-platforms
build-all-platforms: build-binaries-linux build-binaries-windows build-binaries-darwin
Expand All @@ -229,7 +233,7 @@ docker-images-only:
@echo "Finished building jaeger-cassandra-schema =============="
docker build -t $(DOCKER_NAMESPACE)/jaeger-es-index-cleaner:${DOCKER_TAG} plugin/storage/es
@echo "Finished building jaeger-es-indices-clean =============="
for component in agent collector query ; do \
for component in agent collector query ingester ; do \
docker build -t $(DOCKER_NAMESPACE)/jaeger-$$component:${DOCKER_TAG} cmd/$$component ; \
echo "Finished building $$component ==============" ; \
done
Expand All @@ -244,7 +248,7 @@ docker-push:
if [ $$CONFIRM != "y" ] && [ $$CONFIRM != "Y" ]; then \
echo "Exiting." ; exit 1 ; \
fi
for component in agent cassandra-schema es-index-cleaner collector query example-hotrod; do \
for component in agent cassandra-schema es-index-cleaner collector query ingester example-hotrod; do \
docker push $(DOCKER_NAMESPACE)/jaeger-$$component ; \
done

Expand Down
10 changes: 10 additions & 0 deletions cmd/ingester/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM alpine:latest as certs
RUN apk add --update --no-cache ca-certificates

FROM scratch

COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt

EXPOSE 14267
COPY ingester-linux /go/bin/
ENTRYPOINT ["/go/bin/ingester-linux"]
2 changes: 1 addition & 1 deletion scripts/travis/build-docker-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ nvm use 6
export DOCKER_NAMESPACE=jaegertracing
make docker

for component in agent cassandra-schema es-index-cleaner collector query
for component in agent cassandra-schema es-index-cleaner collector query ingester
do
export REPO="jaegertracing/jaeger-${component}"
bash ./scripts/travis/upload-to-docker.sh
Expand Down
1 change: 1 addition & 0 deletions scripts/travis/package-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ function stage-platform-files {
stage-file ./cmd/agent/agent-$PLATFORM $PACKAGE_STAGING_DIR/jaeger-agent$FILE_EXTENSION
stage-file ./cmd/query/query-$PLATFORM $PACKAGE_STAGING_DIR/jaeger-query$FILE_EXTENSION
stage-file ./cmd/collector/collector-$PLATFORM $PACKAGE_STAGING_DIR/jaeger-collector$FILE_EXTENSION
stage-file ./cmd/ingester/ingester-$PLATFORM $PACKAGE_STAGING_DIR/jaeger-ingester$FILE_EXTENSION
stage-file ./examples/hotrod/hotrod-$PLATFORM $PACKAGE_STAGING_DIR/example-hotrod$FILE_EXTENSION
}

Expand Down

0 comments on commit f441f1d

Please sign in to comment.