Skip to content

Commit 11d45f2

Browse files
authored
Revert "[chore] Add dockerhub metadata with links to readme files (#873)" (#901)
This reverts commit 101c9dd.
1 parent 45818a1 commit 11d45f2

File tree

5 files changed

+6
-66
lines changed

5 files changed

+6
-66
lines changed

cmd/goreleaser/internal/configure.go

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,11 @@ 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"}
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-
}
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"}
5549

5650
imageRepos = []string{dockerHub, ghcr}
5751

@@ -147,7 +141,7 @@ var (
147141
d.containerImageManifests = slices.Concat(
148142
newContainerImageManifests(d.name, "linux", k8sArchs, containerImageOptions{}),
149143
)
150-
}).WithDefaultArchives().WithDefaultChecksum().WithDefaultSigns().WithDefaultDockerSigns().WithDefaultDockerHubs().WithDefaultSBOMs().Build()
144+
}).WithDefaultArchives().WithDefaultChecksum().WithDefaultSigns().WithDefaultDockerSigns().WithDefaultSBOMs().Build()
151145
)
152146

153147
type buildConfig interface {
@@ -291,13 +285,6 @@ func (b *distributionBuilder) WithDefaultDockerSigns() *distributionBuilder {
291285
return b
292286
}
293287

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-
301288
func (b *distributionBuilder) dockerSigns() []config.Sign {
302289
return []config.Sign{
303290
{
@@ -310,22 +297,6 @@ func (b *distributionBuilder) dockerSigns() []config.Sign {
310297
}
311298
}
312299

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-
329300
func (b *distributionBuilder) WithDefaultSBOMs() *distributionBuilder {
330301
b.configFuncs = append(b.configFuncs, func(d *distribution) {
331302
d.sboms = b.sboms()
@@ -361,7 +332,6 @@ func (b *distributionBuilder) WithPackagingDefaults() *distributionBuilder {
361332
WithDefaultNfpms().
362333
WithDefaultMSIConfig().
363334
WithDefaultSigns().
364-
WithDefaultDockerHubs().
365335
WithDefaultDockerSigns().
366336
WithDefaultSBOMs()
367337
}
@@ -413,7 +383,6 @@ type distribution struct {
413383
containerImageManifests []config.DockerManifest
414384
signs []config.Sign
415385
dockerSigns []config.Sign
416-
dockerhubs []config.DockerHub
417386
sboms []config.SBOM
418387
checksum config.Checksum
419388
}
@@ -444,7 +413,6 @@ func (d *distribution) BuildProject() config.Project {
444413
DockerManifests: d.containerImageManifests,
445414
Signs: d.signs,
446415
DockerSigns: d.dockerSigns,
447-
DockerHubs: d.dockerhubs,
448416
SBOMs: d.sboms,
449417
Version: 2,
450418
Monorepo: config.Monorepo{

distributions/otelcol-contrib/.goreleaser.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,3 @@ 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: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,3 @@ 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: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -304,10 +304,3 @@ 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: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -324,10 +324,3 @@ 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)