Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 16 additions & 14 deletions cmd/builder/.goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ monorepo:
tag_prefix: cmd/builder/
dir: .core/cmd/builder
version: 2
env:
- CONTAINER_IMAGE_EPHEMERAL_TAG=latest
builds:
- flags:
- -trimpath
Expand Down Expand Up @@ -31,9 +33,9 @@ dockers:
dockerfile: Dockerfile
image_templates:
- otel/opentelemetry-collector-builder:{{ .Version }}-amd64
- otel/opentelemetry-collector-builder:latest-amd64
- otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-amd64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
build_flag_templates:
- --pull
- --platform=linux/amd64
Expand All @@ -48,9 +50,9 @@ dockers:
dockerfile: Dockerfile
image_templates:
- otel/opentelemetry-collector-builder:{{ .Version }}-arm64
- otel/opentelemetry-collector-builder:latest-arm64
- otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-arm64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
build_flag_templates:
- --pull
- --platform=linux/arm64
Expand All @@ -65,9 +67,9 @@ dockers:
dockerfile: Dockerfile
image_templates:
- otel/opentelemetry-collector-builder:{{ .Version }}-ppc64le
- otel/opentelemetry-collector-builder:latest-ppc64le
- otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-ppc64le
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
build_flag_templates:
- --pull
- --platform=linux/ppc64le
Expand All @@ -84,21 +86,21 @@ docker_manifests:
- otel/opentelemetry-collector-builder:{{ .Version }}-amd64
- otel/opentelemetry-collector-builder:{{ .Version }}-arm64
- otel/opentelemetry-collector-builder:{{ .Version }}-ppc64le
- name_template: otel/opentelemetry-collector-builder:latest
- name_template: otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}
image_templates:
- otel/opentelemetry-collector-builder:latest-amd64
- otel/opentelemetry-collector-builder:latest-arm64
- otel/opentelemetry-collector-builder:latest-ppc64le
- otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
- otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
- otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}
image_templates:
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}
image_templates:
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-amd64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-arm64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-ppc64le
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
release:
make_latest: false
github:
Expand Down
13 changes: 7 additions & 6 deletions cmd/goreleaser/internal/configure.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ const (
k8sDistro = "otelcol-k8s"
otlpDistro = "otelcol-otlp"
ebpfProfilerDistro = "otelcol-ebpf-profiler"
dockerHub = "otel"
ghcr = "ghcr.io/open-telemetry/opentelemetry-collector-releases"
binaryNamePrefix = "otelcol"
imageNamePrefix = "opentelemetry-collector"
dockerHub = "otel"
ghcr = "ghcr.io/open-telemetry/opentelemetry-collector-releases"
binaryNamePrefix = "otelcol"
imageNamePrefix = "opentelemetry-collector"
)

var (
Expand Down Expand Up @@ -423,6 +423,7 @@ func (d *distribution) BuildProject() config.Project {
"COSIGN_YES=true",
"LD_FLAGS=" + ldFlags,
"BUILD_FLAGS=-trimpath",
"CONTAINER_IMAGE_EPHEMERAL_TAG=latest",
}
if d.goTags != "" {
env = append(env, "GO_TAGS="+d.goTags)
Expand Down Expand Up @@ -456,7 +457,7 @@ func (d *distribution) BuildProject() config.Project {
}

func newContainerImageManifests(dist, os string, archs []string, opts containerImageOptions) []config.DockerManifest {
tags := []string{`{{ .Version }}`, "latest"}
tags := []string{`{{ .Version }}`, "{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}"}
if os == "windows" {
for i, tag := range tags {
tags[i] = fmt.Sprintf("%s-%s-%s", tag, os, opts.winVersion)
Expand Down Expand Up @@ -551,7 +552,7 @@ func dockerImageWithOS(dist, os, arch string, opts containerImageOptions) config
imageTemplates = append(
imageTemplates,
fmt.Sprintf("%s/%s:{{ .Version }}-%s", prefix, imageName(dist), osArch.imageTag()),
fmt.Sprintf("%s/%s:latest-%s", prefix, imageName(dist), osArch.imageTag()),
fmt.Sprintf("%s/%s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-%s", prefix, imageName(dist), osArch.imageTag()),
)
}

Expand Down
30 changes: 16 additions & 14 deletions cmd/opampsupervisor/.goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ monorepo:
tag_prefix: cmd/opampsupervisor/
dir: .contrib/cmd/opampsupervisor
version: 2
env:
- CONTAINER_IMAGE_EPHEMERAL_TAG=latest
builds:
- flags:
- -trimpath
Expand Down Expand Up @@ -31,9 +33,9 @@ dockers:
dockerfile: Dockerfile
image_templates:
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
- otel/opentelemetry-collector-opampsupervisor:latest-amd64
- otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-amd64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
build_flag_templates:
- --pull
- --platform=linux/amd64
Expand All @@ -48,9 +50,9 @@ dockers:
dockerfile: Dockerfile
image_templates:
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
- otel/opentelemetry-collector-opampsupervisor:latest-arm64
- otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-arm64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
build_flag_templates:
- --pull
- --platform=linux/arm64
Expand All @@ -65,9 +67,9 @@ dockers:
dockerfile: Dockerfile
image_templates:
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
- otel/opentelemetry-collector-opampsupervisor:latest-ppc64le
- otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-ppc64le
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
build_flag_templates:
- --pull
- --platform=linux/ppc64le
Expand All @@ -84,21 +86,21 @@ docker_manifests:
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
- name_template: otel/opentelemetry-collector-opampsupervisor:latest
- name_template: otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}
image_templates:
- otel/opentelemetry-collector-opampsupervisor:latest-amd64
- otel/opentelemetry-collector-opampsupervisor:latest-arm64
- otel/opentelemetry-collector-opampsupervisor:latest-ppc64le
- otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
- otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
- otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}
image_templates:
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}
image_templates:
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-amd64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-arm64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-ppc64le
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
release:
make_latest: false
github:
Expand Down
1 change: 1 addition & 0 deletions distributions/otelcol-contrib/.goreleaser-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ env:
- COSIGN_YES=true
- LD_FLAGS=-s -w
- BUILD_FLAGS=-trimpath
- CONTAINER_IMAGE_EPHEMERAL_TAG=latest
- CGO_ENABLED=0
release:
replace_existing_artifacts: true
Expand Down
Loading