From 2f52ef7b6254abc6ac8666978c0c01fff59c1f1a Mon Sep 17 00:00:00 2001
From: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
Date: Wed, 24 Jan 2024 15:13:58 +0100
Subject: [PATCH 1/2] ci: fix benthos collector dockerfile

Signed-off-by: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
---
 .github/workflows/artifacts.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/artifacts.yaml b/.github/workflows/artifacts.yaml
index 803e7fbd9..fda9dd5bf 100644
--- a/.github/workflows/artifacts.yaml
+++ b/.github/workflows/artifacts.yaml
@@ -214,7 +214,7 @@ jobs:
         uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0
         with:
           context: .
-          target: ${{ matrix.target }}
+          file: benthos-collector.Dockerfile
           build-args: |
             VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
           platforms: linux/amd64,linux/arm64 # The confluent library and UBI8 don't support ARMv7

From 0de98589687b0649a362338c67943931bcf26b70 Mon Sep 17 00:00:00 2001
From: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
Date: Wed, 24 Jan 2024 15:28:57 +0100
Subject: [PATCH 2/2] ci: fix benthos collector binary build

Signed-off-by: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
---
 ci/build.go   | 1 +
 ci/release.go | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci/build.go b/ci/build.go
index a7fec94a9..e72922699 100644
--- a/ci/build.go
+++ b/ci/build.go
@@ -191,6 +191,7 @@ func (m *Binary) build(platform Platform, version string, pkg string) *File {
 
 	return goModule().
 		WithSource(m.Source).
+		WithPlatform(string(platform)).
 		Build(GoWithSourceBuildOpts{
 			Name:     "benthos",
 			Pkg:      pkg,
diff --git a/ci/release.go b/ci/release.go
index d7e35f32a..09bd6e92d 100644
--- a/ci/release.go
+++ b/ci/release.go
@@ -94,7 +94,7 @@ func (m *Ci) binaryArchive(version string, platform Platform) *File {
 	}
 
 	return archiver.Archive(
-		fmt.Sprintf("benthos_%s", strings.ReplaceAll(string(platform), "/", "_")),
+		fmt.Sprintf("benthos-collector_%s", strings.ReplaceAll(string(platform), "/", "_")),
 		dag.Directory().
 			WithFile("", m.Build().Binary().benthosCollector(platform, version)).
 			WithFile("", m.Source.File("README.md")).