Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Exclude 386 from opentelemetry-collector-contrib builds" #144

Merged
merged 1 commit into from
Jun 3, 2022
Merged

Revert "Exclude 386 from opentelemetry-collector-contrib builds" #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .goreleaser.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ builds:
- linux
- windows
goarch:
- "386"
- amd64
- arm64
ignore:
Expand Down Expand Up @@ -162,6 +163,24 @@ 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
Expand Down Expand Up @@ -215,11 +234,14 @@ 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:{{
Expand Down
15 changes: 4 additions & 11 deletions goreleaser/configure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,11 @@ 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()

Expand Down Expand Up @@ -84,7 +77,7 @@ func Build(dist string) config.Build {
Ldflags: []string{"-s", "-w"},
},
Goos: []string{"darwin", "linux", "windows"},
Goarch: architecturesForDist(dist),
Goarch: Architectures,
Ignore: []config.IgnoredBuild{
{Goos: "darwin", Goarch: "386"},
{Goos: "windows", Goarch: "arm64"},
Expand Down Expand Up @@ -157,7 +150,7 @@ func Package(dist string) config.NFPM {

func DockerImages(imagePrefixes, dists []string) (r []config.Docker) {
for _, dist := range dists {
for _, arch := range architecturesForDist(dist) {
for _, arch := range Architectures {
r = append(r, DockerImage(imagePrefixes, dist, arch))
}
}
Expand Down Expand Up @@ -211,7 +204,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 architecturesForDist(dist) {
for _, arch := range Architectures {
imageTemplates = append(
imageTemplates,
fmt.Sprintf("%s/%s:{{ .Version }}-%s", prefix, imageName(dist), arch),
Expand Down