Skip to content

Commit

Permalink
[Makefile] Fix docker-otelcontribcol make target (open-telemetry#13159)
Browse files Browse the repository at this point in the history
  • Loading branch information
dmitryax authored Aug 10, 2022
1 parent 9654a43 commit ae3ce29
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
- `spanmetricsprocessor`: Fix panic caused by race condition when accessing span attributes. (#12644)
- `awsxrayexporter`: Stop dropping exception in aws xray events for non error codes (#12643)
- `signalfxexporter`: use azure.vm.name instead of host.name to build azure resource id (#12779)
- `otelcontribcol`: Enabled multi-arch build for local development container builds (#11873)
- `receiver/hostmetrics`: Do not throw scraping errors if conntrack metrics collection is disabled (#12799)
- `kubeletstatsreceiver`: Fetch metadata from initContainers (#12887)
- `metricstransformprocessor`: Fix logic in merging exponential histogram. (#12865)
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ run:

.PHONY: docker-component # Not intended to be used directly
docker-component: check-component
GOOS=$(GOOS) GOARCH=$(GOARCH) $(MAKE) $(COMPONENT)
cp ./bin/$(COMPONENT)_$(GOOS)_$(GOARCH)$(EXTENSION) ./cmd/$(COMPONENT)/$(COMPONENT)
GOOS=linux GOARCH=amd64 $(MAKE) $(COMPONENT)
cp ./bin/$(COMPONENT)_linux_amd64 ./cmd/$(COMPONENT)/$(COMPONENT)
docker build -t $(COMPONENT) ./cmd/$(COMPONENT)/
rm ./cmd/$(COMPONENT)/$(COMPONENT)

Expand Down

0 comments on commit ae3ce29

Please sign in to comment.