Skip to content

Commit 101c9dd

Browse files
authored
[chore] Add dockerhub metadata with links to readme files (#873)
* add dockerhub full desriptions with links to readme files Signed-off-by: Moritz Wiesinger <[email protected]> * adjust descriptions to include distro name Signed-off-by: Moritz Wiesinger <[email protected]> --------- Signed-off-by: Moritz Wiesinger <[email protected]>
1 parent 55d0da2 commit 101c9dd

File tree

5 files changed

+66
-6
lines changed

5 files changed

+66
-6
lines changed

cmd/goreleaser/internal/configure.go

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,17 @@ const (
4141
)
4242

4343
var (
44-
baseArchs = []string{"386", "amd64", "arm", "arm64", "ppc64le", "s390x"}
45-
winArchs = []string{"386", "amd64", "arm64"}
46-
winContainerArchs = []string{"amd64"}
47-
darwinArchs = []string{"amd64", "arm64"}
48-
k8sArchs = []string{"amd64", "arm64", "ppc64le", "s390x"}
44+
baseArchs = []string{"386", "amd64", "arm", "arm64", "ppc64le", "s390x"}
45+
winArchs = []string{"386", "amd64", "arm64"}
46+
winContainerArchs = []string{"amd64"}
47+
darwinArchs = []string{"amd64", "arm64"}
48+
k8sArchs = []string{"amd64", "arm64", "ppc64le", "s390x"}
49+
dockerHubFullDescriptions = map[string]string{
50+
coreDistro: "https://raw.githubusercontent.com/open-telemetry/opentelemetry-collector/refs/heads/main/README.md",
51+
contribDistro: "https://raw.githubusercontent.com/open-telemetry/opentelemetry-collector-contrib/refs/heads/main/README.md",
52+
otlpDistro: "https://raw.githubusercontent.com/open-telemetry/opentelemetry-collector-releases/refs/heads/main/distributions/otelcol-otlp/README.md",
53+
k8sDistro: "https://raw.githubusercontent.com/open-telemetry/opentelemetry-collector-releases/refs/heads/main/distributions/otelcol-k8s/README.md",
54+
}
4955

5056
imageRepos = []string{dockerHub, ghcr}
5157

@@ -141,7 +147,7 @@ var (
141147
d.containerImageManifests = slices.Concat(
142148
newContainerImageManifests(d.name, "linux", k8sArchs, containerImageOptions{}),
143149
)
144-
}).WithDefaultArchives().WithDefaultChecksum().WithDefaultSigns().WithDefaultDockerSigns().WithDefaultSBOMs().Build()
150+
}).WithDefaultArchives().WithDefaultChecksum().WithDefaultSigns().WithDefaultDockerSigns().WithDefaultDockerHubs().WithDefaultSBOMs().Build()
145151
)
146152

147153
type buildConfig interface {
@@ -285,6 +291,13 @@ func (b *distributionBuilder) WithDefaultDockerSigns() *distributionBuilder {
285291
return b
286292
}
287293

294+
func (b *distributionBuilder) WithDefaultDockerHubs() *distributionBuilder {
295+
b.configFuncs = append(b.configFuncs, func(d *distribution) {
296+
d.dockerhubs = b.dockerHubs()
297+
})
298+
return b
299+
}
300+
288301
func (b *distributionBuilder) dockerSigns() []config.Sign {
289302
return []config.Sign{
290303
{
@@ -297,6 +310,22 @@ func (b *distributionBuilder) dockerSigns() []config.Sign {
297310
}
298311
}
299312

313+
func (b *distributionBuilder) dockerHubs() []config.DockerHub {
314+
return []config.DockerHub{
315+
{
316+
Images: []string{
317+
fmt.Sprintf("%s/%s", dockerHub, imageName(b.dist.name)),
318+
},
319+
Description: fmt.Sprintf("OpenTelemetry Collector - %s", b.dist.name),
320+
FullDescription: config.IncludedMarkdown{
321+
FromURL: config.IncludeFromURL{
322+
URL: dockerHubFullDescriptions[b.dist.name],
323+
},
324+
},
325+
},
326+
}
327+
}
328+
300329
func (b *distributionBuilder) WithDefaultSBOMs() *distributionBuilder {
301330
b.configFuncs = append(b.configFuncs, func(d *distribution) {
302331
d.sboms = b.sboms()
@@ -332,6 +361,7 @@ func (b *distributionBuilder) WithPackagingDefaults() *distributionBuilder {
332361
WithDefaultNfpms().
333362
WithDefaultMSIConfig().
334363
WithDefaultSigns().
364+
WithDefaultDockerHubs().
335365
WithDefaultDockerSigns().
336366
WithDefaultSBOMs()
337367
}
@@ -383,6 +413,7 @@ type distribution struct {
383413
containerImageManifests []config.DockerManifest
384414
signs []config.Sign
385415
dockerSigns []config.Sign
416+
dockerhubs []config.DockerHub
386417
sboms []config.SBOM
387418
checksum config.Checksum
388419
}
@@ -413,6 +444,7 @@ func (d *distribution) BuildProject() config.Project {
413444
DockerManifests: d.containerImageManifests,
414445
Signs: d.signs,
415446
DockerSigns: d.dockerSigns,
447+
DockerHubs: d.dockerhubs,
416448
SBOMs: d.sboms,
417449
Version: 2,
418450
Monorepo: config.Monorepo{

distributions/otelcol-contrib/.goreleaser.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,3 +329,10 @@ monorepo:
329329
tag_prefix: v
330330
partial:
331331
by: target
332+
dockerhub:
333+
- images:
334+
- otel/opentelemetry-collector-contrib
335+
description: OpenTelemetry Collector - otelcol-contrib
336+
full_description:
337+
from_url:
338+
url: https://raw.githubusercontent.com/open-telemetry/opentelemetry-collector-contrib/refs/heads/main/README.md

distributions/otelcol-k8s/.goreleaser.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,3 +209,10 @@ monorepo:
209209
tag_prefix: v
210210
partial:
211211
by: target
212+
dockerhub:
213+
- images:
214+
- otel/opentelemetry-collector-k8s
215+
description: OpenTelemetry Collector - otelcol-k8s
216+
full_description:
217+
from_url:
218+
url: https://raw.githubusercontent.com/open-telemetry/opentelemetry-collector-releases/refs/heads/main/distributions/otelcol-k8s/README.md

distributions/otelcol-otlp/.goreleaser.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,3 +304,10 @@ monorepo:
304304
tag_prefix: v
305305
partial:
306306
by: target
307+
dockerhub:
308+
- images:
309+
- otel/opentelemetry-collector-otlp
310+
description: OpenTelemetry Collector - otelcol-otlp
311+
full_description:
312+
from_url:
313+
url: https://raw.githubusercontent.com/open-telemetry/opentelemetry-collector-releases/refs/heads/main/distributions/otelcol-otlp/README.md

distributions/otelcol/.goreleaser.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,3 +324,10 @@ monorepo:
324324
tag_prefix: v
325325
partial:
326326
by: target
327+
dockerhub:
328+
- images:
329+
- otel/opentelemetry-collector
330+
description: OpenTelemetry Collector - otelcol
331+
full_description:
332+
from_url:
333+
url: https://raw.githubusercontent.com/open-telemetry/opentelemetry-collector/refs/heads/main/README.md

0 commit comments

Comments
 (0)