From fe8f76161c06c42d62024cd3b512bfe14d3a7fd1 Mon Sep 17 00:00:00 2001
From: Pablo Baeyens <pablo.baeyens@datadoghq.com>
Date: Thu, 17 Mar 2022 14:08:30 +0100
Subject: [PATCH] Exclude 386 for contrib (#83)

---
 .goreleaser.yaml        | 22 ----------------------
 goreleaser/configure.go | 15 +++++++++++----
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 2310dd26..9b63fedb 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -27,7 +27,6 @@ builds:
   - linux
   - windows
   goarch:
-  - "386"
   - amd64
   - arm64
   ignore:
@@ -159,24 +158,6 @@ dockers:
   - --label=org.opencontainers.image.version={{.Version}}
   - --label=org.opencontainers.image.source={{.GitURL}}
   use: buildx
-- goos: linux
-  goarch: "386"
-  dockerfile: distributions/otelcol-contrib/Dockerfile
-  image_templates:
-  - otel/opentelemetry-collector-contrib:{{ .Version }}-386
-  - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{
-    .Version }}-386
-  extra_files:
-  - configs/otelcol-contrib.yaml
-  build_flag_templates:
-  - --pull
-  - --platform=linux/386
-  - --label=org.opencontainers.image.created={{.Date}}
-  - --label=org.opencontainers.image.name={{.ProjectName}}
-  - --label=org.opencontainers.image.revision={{.FullCommit}}
-  - --label=org.opencontainers.image.version={{.Version}}
-  - --label=org.opencontainers.image.source={{.GitURL}}
-  use: buildx
 - goos: linux
   goarch: amd64
   dockerfile: distributions/otelcol-contrib/Dockerfile
@@ -230,14 +211,11 @@ docker_manifests:
     .Version }}-arm64
 - name_template: otel/opentelemetry-collector-contrib:{{ .Version }}
   image_templates:
-  - otel/opentelemetry-collector-contrib:{{ .Version }}-386
   - otel/opentelemetry-collector-contrib:{{ .Version }}-amd64
   - otel/opentelemetry-collector-contrib:{{ .Version }}-arm64
 - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{
     .Version }}
   image_templates:
-  - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{
-    .Version }}-386
   - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{
     .Version }}-amd64
   - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{
diff --git a/goreleaser/configure.go b/goreleaser/configure.go
index a9d07a16..30df7c7a 100644
--- a/goreleaser/configure.go
+++ b/goreleaser/configure.go
@@ -22,11 +22,18 @@ import (
 
 var (
 	ImagePrefixes = []string{"otel", "ghcr.io/open-telemetry/opentelemetry-collector-releases"}
-	Architectures = []string{"386", "amd64", "arm64"}
 
 	distsFlag = flag.String("d", "", "Collector distributions(s) to build, comma-separated")
 )
 
+func architecturesForDist(dist string) []string {
+	architectures := []string{"386", "amd64", "arm64"}
+	if dist == "otelcol-contrib" {
+		architectures = []string{"amd64", "arm64"}
+	}
+	return architectures
+}
+
 func main() {
 	flag.Parse()
 
@@ -76,7 +83,7 @@ func Build(dist string) config.Build {
 		Ldflags: []string{"-s", "-w"},
 
 		Goos:   []string{"darwin", "linux", "windows"},
-		Goarch: Architectures,
+		Goarch: architecturesForDist(dist),
 		Ignore: []config.IgnoredBuild{
 			{Goos: "windows", Goarch: "arm64"},
 		},
@@ -148,7 +155,7 @@ func Package(dist string) config.NFPM {
 
 func DockerImages(imagePrefixes, dists []string) (r []config.Docker) {
 	for _, dist := range dists {
-		for _, arch := range Architectures {
+		for _, arch := range architecturesForDist(dist) {
 			r = append(r, DockerImage(imagePrefixes, dist, arch))
 		}
 	}
@@ -202,7 +209,7 @@ func DockerManifests(imagePrefixes, dists []string) (r []config.DockerManifest)
 func DockerManifest(imagePrefixes []string, dist string) (manifests []config.DockerManifest) {
 	for _, prefix := range imagePrefixes {
 		var imageTemplates []string
-		for _, arch := range Architectures {
+		for _, arch := range architecturesForDist(dist) {
 			imageTemplates = append(
 				imageTemplates,
 				fmt.Sprintf("%s/%s:{{ .Version }}-%s", prefix, imageName(dist), arch),