fix builds for multi arch

Author: puckpuck

Dockerfile

@@ -1,13 +1,25 @@
+FROM golang:1.20-bullseye as builder
+RUN go install go.opentelemetry.io/collector/cmd/builder@latest
+
+WORKDIR /
+
+COPY metricsasattributesprocessor ./metricsasattributesprocessor
+COPY ocb.yaml ./ocb.yaml
+
+RUN builder --config=ocb.yaml
+
+
 FROM alpine:3.16 as certs
 RUN apk --update add ca-certificates
 
+
 FROM scratch
 
 ARG USER_UID=10001
 USER ${USER_UID}
 
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
-COPY --chmod=755 dist/otelcol-custom /otelcol-custom
+COPY --from=builder /dist/otelcol-custom /otelcol-custom
 EXPOSE 4317 4318
 ENTRYPOINT ["/otelcol-custom"]
-CMD ["--config", "/etc/otel/config.yaml"]
+CMD ["--config", "/etc/otel/config.yaml"]

Makefile

@@ -1,23 +1,21 @@
 IMAGE_REPOSITORY ?= "otelcol-custom"
 IMAGE_TAG ?= "latest"
 
-.PHONY: build
-build:
+.PHONY: build-local
+build-local:
 	builder --config=ocb.yaml
 
-.PHONY: build-and-push-dockerhub
-build-and-push-dockerhub: build
+.PHONY: build
+build:
 	docker build -t $(IMAGE_REPOSITORY):$(IMAGE_TAG) .
-	docker push $(IMAGE_REPOSITORY):$(IMAGE_TAG)
 
-# This is required to build a proper executable that can be included in a docker image for an arm64 architecture K8s cluster
-.PHONY: build-arm
-build-arm:
-	env GOOS=linux GOARCH=arm64 builder --config=ocb.yaml
+.PHONY: build-and-push
+build-and-push: build
+	docker push $(IMAGE_REPOSITORY):$(IMAGE_TAG)
 
-.PHONY: build-arm-and-push-dockerhub
-build-arm-and-push-dockerhub: build-arm
-	docker buildx build --push --platform linux/arm/v7,linux/arm64/v8 -t $(IMAGE_REPOSITORY):$(IMAGE_TAG) .
+.PHONY: build-and-push-multiarch
+build-and-push-multiarch:
+	docker buildx build --push --platform linux/amd64,linux/arm64 -t $(IMAGE_REPOSITORY):$(IMAGE_TAG) .
 
 .PHONY: run
 run: