Merge pull request #566 from openmeterio/fix-benthos-collector

ci: fix benthos collector dockerfile
openmeterio · Jan 24, 2024 · 880669b · 880669b
2 parents 8d205f6 + 0de9858
commit 880669b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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

diff --git 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
@@ -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")).