From b7405b0e77a0f6a0676ef7ba504d8214567de12d Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Tue, 9 Jul 2024 14:44:14 +0000 Subject: [PATCH 1/2] Fix telemetrygen docker build --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7e5b042f40a8..c033110b6ef9 100644 --- a/Makefile +++ b/Makefile @@ -278,7 +278,7 @@ docker-otelcontribcol: docker-telemetrygen: GOOS=linux GOARCH=$(GOARCH) $(MAKE) telemetrygen cp bin/telemetrygen_* cmd/telemetrygen/ - cd cmd/telemetrygen && docker build --platform linux/$(GOARCH) -t telemetrygen:latest . + cd cmd/telemetrygen && docker build --platform linux/$(GOARCH) --build-arg="TARGETOS=$(GOOS)" --build-arg="TARGETARCH=$(GOARCH)" -t telemetrygen:latest . rm cmd/telemetrygen/telemetrygen_* .PHONY: generate From 87ccf3f607169249365d00864990e430b4ea7f3b Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Tue, 9 Jul 2024 16:38:17 +0000 Subject: [PATCH 2/2] Add changelog --- .chloggen/fix-docker-telemetrygen.yaml | 27 ++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .chloggen/fix-docker-telemetrygen.yaml diff --git a/.chloggen/fix-docker-telemetrygen.yaml b/.chloggen/fix-docker-telemetrygen.yaml new file mode 100644 index 000000000000..a1341821962e --- /dev/null +++ b/.chloggen/fix-docker-telemetrygen.yaml @@ -0,0 +1,27 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: cmd/telemetrygen + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix `make docker-telemetrygen` command. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [33989] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: []