Skip to content

Commit 9640a75

Browse files
mowiesmowies
committed
[chore] use variable for latest tag in goreleaser
1 parent dd11b5b commit 9640a75

File tree

9 files changed

+163
-152
lines changed

9 files changed

+163
-152
lines changed

‎cmd/builder/.goreleaser.yml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ monorepo:
22
tag_prefix: cmd/builder/
33
dir: .core/cmd/builder
44
version: 2
5+
env:
6+
- CONTAINER_IMAGE_EPHEMERAL_TAG=latest
57
builds:
68
- flags:
79
- -trimpath
@@ -31,9 +33,9 @@ dockers:
3133
dockerfile: Dockerfile
3234
image_templates:
3335
- otel/opentelemetry-collector-builder:{{ .Version }}-amd64
34-
- otel/opentelemetry-collector-builder:latest-amd64
36+
- otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
3537
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64
36-
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-amd64
38+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
3739
build_flag_templates:
3840
- --pull
3941
- --platform=linux/amd64
@@ -48,9 +50,9 @@ dockers:
4850
dockerfile: Dockerfile
4951
image_templates:
5052
- otel/opentelemetry-collector-builder:{{ .Version }}-arm64
51-
- otel/opentelemetry-collector-builder:latest-arm64
53+
- otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
5254
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64
53-
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-arm64
55+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
5456
build_flag_templates:
5557
- --pull
5658
- --platform=linux/arm64
@@ -65,9 +67,9 @@ dockers:
6567
dockerfile: Dockerfile
6668
image_templates:
6769
- otel/opentelemetry-collector-builder:{{ .Version }}-ppc64le
68-
- otel/opentelemetry-collector-builder:latest-ppc64le
70+
- otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
6971
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le
70-
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-ppc64le
72+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
7173
build_flag_templates:
7274
- --pull
7375
- --platform=linux/ppc64le
@@ -84,21 +86,21 @@ docker_manifests:
8486
- otel/opentelemetry-collector-builder:{{ .Version }}-amd64
8587
- otel/opentelemetry-collector-builder:{{ .Version }}-arm64
8688
- otel/opentelemetry-collector-builder:{{ .Version }}-ppc64le
87-
- name_template: otel/opentelemetry-collector-builder:latest
89+
- name_template: otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}
8890
image_templates:
89-
- otel/opentelemetry-collector-builder:latest-amd64
90-
- otel/opentelemetry-collector-builder:latest-arm64
91-
- otel/opentelemetry-collector-builder:latest-ppc64le
91+
- otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
92+
- otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
93+
- otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
9294
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}
9395
image_templates:
9496
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64
9597
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64
9698
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le
97-
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest
99+
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}
98100
image_templates:
99-
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-amd64
100-
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-arm64
101-
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-ppc64le
101+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
102+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
103+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
102104
release:
103105
make_latest: false
104106
github:

‎cmd/goreleaser/internal/configure.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ const (
3535
k8sDistro = "otelcol-k8s"
3636
otlpDistro = "otelcol-otlp"
3737
ebpfProfilerDistro = "otelcol-ebpf-profiler"
38-
dockerHub = "otel"
39-
ghcr = "ghcr.io/open-telemetry/opentelemetry-collector-releases"
40-
binaryNamePrefix = "otelcol"
41-
imageNamePrefix = "opentelemetry-collector"
38+
dockerHub = "otel"
39+
ghcr = "ghcr.io/open-telemetry/opentelemetry-collector-releases"
40+
binaryNamePrefix = "otelcol"
41+
imageNamePrefix = "opentelemetry-collector"
4242
)
4343

4444
var (
@@ -423,6 +423,7 @@ func (d *distribution) BuildProject() config.Project {
423423
"COSIGN_YES=true",
424424
"LD_FLAGS=" + ldFlags,
425425
"BUILD_FLAGS=-trimpath",
426+
"CONTAINER_IMAGE_EPHEMERAL_TAG=latest",
426427
}
427428
if d.goTags != "" {
428429
env = append(env, "GO_TAGS="+d.goTags)
@@ -456,7 +457,7 @@ func (d *distribution) BuildProject() config.Project {
456457
}
457458

458459
func newContainerImageManifests(dist, os string, archs []string, opts containerImageOptions) []config.DockerManifest {
459-
tags := []string{`{{ .Version }}`, "latest"}
460+
tags := []string{`{{ .Version }}`, "{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}"}
460461
if os == "windows" {
461462
for i, tag := range tags {
462463
tags[i] = fmt.Sprintf("%s-%s-%s", tag, os, opts.winVersion)
@@ -551,7 +552,7 @@ func dockerImageWithOS(dist, os, arch string, opts containerImageOptions) config
551552
imageTemplates = append(
552553
imageTemplates,
553554
fmt.Sprintf("%s/%s:{{ .Version }}-%s", prefix, imageName(dist), osArch.imageTag()),
554-
fmt.Sprintf("%s/%s:latest-%s", prefix, imageName(dist), osArch.imageTag()),
555+
fmt.Sprintf("%s/%s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-%s", prefix, imageName(dist), osArch.imageTag()),
555556
)
556557
}
557558

‎cmd/opampsupervisor/.goreleaser.yml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ monorepo:
22
tag_prefix: cmd/opampsupervisor/
33
dir: .contrib/cmd/opampsupervisor
44
version: 2
5+
env:
6+
- CONTAINER_IMAGE_EPHEMERAL_TAG=latest
57
builds:
68
- flags:
79
- -trimpath
@@ -31,9 +33,9 @@ dockers:
3133
dockerfile: Dockerfile
3234
image_templates:
3335
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
34-
- otel/opentelemetry-collector-opampsupervisor:latest-amd64
36+
- otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
3537
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
36-
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-amd64
38+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
3739
build_flag_templates:
3840
- --pull
3941
- --platform=linux/amd64
@@ -48,9 +50,9 @@ dockers:
4850
dockerfile: Dockerfile
4951
image_templates:
5052
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
51-
- otel/opentelemetry-collector-opampsupervisor:latest-arm64
53+
- otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
5254
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
53-
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-arm64
55+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
5456
build_flag_templates:
5557
- --pull
5658
- --platform=linux/arm64
@@ -65,9 +67,9 @@ dockers:
6567
dockerfile: Dockerfile
6668
image_templates:
6769
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
68-
- otel/opentelemetry-collector-opampsupervisor:latest-ppc64le
70+
- otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
6971
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
70-
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-ppc64le
72+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
7173
build_flag_templates:
7274
- --pull
7375
- --platform=linux/ppc64le
@@ -84,21 +86,21 @@ docker_manifests:
8486
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
8587
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
8688
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
87-
- name_template: otel/opentelemetry-collector-opampsupervisor:latest
89+
- name_template: otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}
8890
image_templates:
89-
- otel/opentelemetry-collector-opampsupervisor:latest-amd64
90-
- otel/opentelemetry-collector-opampsupervisor:latest-arm64
91-
- otel/opentelemetry-collector-opampsupervisor:latest-ppc64le
91+
- otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
92+
- otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
93+
- otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
9294
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}
9395
image_templates:
9496
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
9597
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
9698
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
97-
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest
99+
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}
98100
image_templates:
99-
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-amd64
100-
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-arm64
101-
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-ppc64le
101+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
102+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
103+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
102104
release:
103105
make_latest: false
104106
github:

‎distributions/otelcol-contrib/.goreleaser-build.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ env:
44
- COSIGN_YES=true
55
- LD_FLAGS=-s -w
66
- BUILD_FLAGS=-trimpath
7+
- CONTAINER_IMAGE_EPHEMERAL_TAG=latest
78
- CGO_ENABLED=0
89
release:
910
replace_existing_artifacts: true

0 commit comments

Comments
 (0)