Skip to content

Commit

Permalink
Update Makefile and Dockerfile for anonymizer (jaegertracing#2632)
Browse files Browse the repository at this point in the history
Signed-off-by: Ashmita Bohara <[email protected]>
  • Loading branch information
Ashmita152 authored and quinniup committed Nov 23, 2020
1 parent 5bb02ef commit f8e596c
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 6 deletions.
19 changes: 13 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,10 @@ build-examples:
build-tracegen:
$(GOBUILD) -o ./cmd/tracegen/tracegen-$(GOOS)-$(GOARCH) ./cmd/tracegen/main.go

.PHONY: build-anonymizer
build-anonymizer:
$(GOBUILD) -o ./cmd/anonymizer/anonymizer-$(GOOS)-$(GOARCH) ./cmd/anonymizer/main.go

.PHONY: docker-hotrod
docker-hotrod:
GOOS=linux $(MAKE) build-examples
Expand Down Expand Up @@ -250,10 +254,6 @@ build-all-in-one build-all-in-one-debug: build-ui elasticsearch-mappings
build-agent build-agent-debug:
$(GOBUILD) $(DISABLE_OPTIMIZATIONS) -o ./cmd/agent/agent$(SUFFIX)-$(GOOS)-$(GOARCH) $(BUILD_INFO) ./cmd/agent/main.go

.PHONY: build-anonymizer
build-anonymizer:
$(GOBUILD) $(DISABLE_OPTIMIZATIONS) -o ./cmd/anonymizer/anonymizer$(SUFFIX)-$(GOOS)-$(GOARCH) $(BUILD_INFO) ./cmd/anonymizer/main.go

.PHONY: build-query build-query-debug
build-query build-query-debug: build-ui
$(GOBUILD) $(DISABLE_OPTIMIZATIONS) -tags ui -o ./cmd/query/query$(SUFFIX)-$(GOOS)-$(GOARCH) $(BUILD_INFO) ./cmd/query/main.go
Expand Down Expand Up @@ -321,6 +321,7 @@ build-platform-binaries: build-agent \
build-all-in-one \
build-examples \
build-tracegen \
build-anonymizer \
build-otel-collector \
build-otel-agent \
build-otel-ingester \
Expand Down Expand Up @@ -364,12 +365,18 @@ docker-images-tracegen:
docker build -t $(DOCKER_NAMESPACE)/jaeger-tracegen:${DOCKER_TAG} cmd/tracegen/ --build-arg TARGETARCH=$(GOARCH)
@echo "Finished building jaeger-tracegen =============="

.PHONY: docker-images-anonymizer
docker-images-anonymizer:
docker build -t $(DOCKER_NAMESPACE)/jaeger-anonymizer:${DOCKER_TAG} cmd/anonymizer/ --build-arg TARGETARCH=$(GOARCH)
@echo "Finished building jaeger-anonymizer =============="

.PHONY: docker-images-only
docker-images-only: docker-images-cassandra \
docker-images-elastic \
docker-images-jaeger-backend \
docker-images-jaeger-backend-debug \
docker-images-tracegen
docker-images-tracegen \
docker-images-anonymizer

.PHONY: docker-push
docker-push:
Expand All @@ -379,7 +386,7 @@ docker-push:
if [ $$CONFIRM != "y" ] && [ $$CONFIRM != "Y" ]; then \
echo "Exiting." ; exit 1 ; \
fi
for component in agent cassandra-schema es-index-cleaner es-rollover collector query ingester example-hotrod tracegen; do \
for component in agent cassandra-schema es-index-cleaner es-rollover collector query ingester example-hotrod tracegen anonymizer; do \
docker push $(DOCKER_NAMESPACE)/jaeger-$$component ; \
done

Expand Down
5 changes: 5 additions & 0 deletions cmd/anonymizer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM scratch
ARG TARGETARCH=amd64

COPY anonymizer-linux-$TARGETARCH /go/bin/anonymizer-linux
ENTRYPOINT ["/go/bin/anonymizer-linux"]
1 change: 1 addition & 0 deletions scripts/travis/upload-all-docker-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ jaeger_components=(
ingester
ingester-debug
tracegen
anonymizer
opentelemetry-collector
opentelemetry-agent
opentelemetry-ingester
Expand Down

0 comments on commit f8e596c

Please sign in to comment.