diff --git a/.gitignore b/.gitignore
index 8665171f70b..612860c9e16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/Makefile b/Makefile
index 857ee792c84..fc1ccec36d5 100644
--- a/Makefile
+++ b/Makefile
@@ -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
@@ -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
@@ -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
@@ -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
 
diff --git a/cmd/ingester/Dockerfile b/cmd/ingester/Dockerfile
new file mode 100644
index 00000000000..2cfa7817eaf
--- /dev/null
+++ b/cmd/ingester/Dockerfile
@@ -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"]
diff --git a/scripts/travis/build-docker-images.sh b/scripts/travis/build-docker-images.sh
index 680331a2edd..8c6491205cf 100755
--- a/scripts/travis/build-docker-images.sh
+++ b/scripts/travis/build-docker-images.sh
@@ -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
diff --git a/scripts/travis/package-deploy.sh b/scripts/travis/package-deploy.sh
index 7bd0ab3aa2e..9eb0e1fb047 100755
--- a/scripts/travis/package-deploy.sh
+++ b/scripts/travis/package-deploy.sh
@@ -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
 }