@@ -41,17 +41,11 @@ const (
41
41
)
42
42
43
43
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" }
55
49
56
50
imageRepos = []string {dockerHub , ghcr }
57
51
@@ -147,7 +141,7 @@ var (
147
141
d .containerImageManifests = slices .Concat (
148
142
newContainerImageManifests (d .name , "linux" , k8sArchs , containerImageOptions {}),
149
143
)
150
- }).WithDefaultArchives ().WithDefaultChecksum ().WithDefaultSigns ().WithDefaultDockerSigns ().WithDefaultDockerHubs (). WithDefaultSBOMs ().Build ()
144
+ }).WithDefaultArchives ().WithDefaultChecksum ().WithDefaultSigns ().WithDefaultDockerSigns ().WithDefaultSBOMs ().Build ()
151
145
)
152
146
153
147
type buildConfig interface {
@@ -291,13 +285,6 @@ func (b *distributionBuilder) WithDefaultDockerSigns() *distributionBuilder {
291
285
return b
292
286
}
293
287
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
-
301
288
func (b * distributionBuilder ) dockerSigns () []config.Sign {
302
289
return []config.Sign {
303
290
{
@@ -310,22 +297,6 @@ func (b *distributionBuilder) dockerSigns() []config.Sign {
310
297
}
311
298
}
312
299
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
-
329
300
func (b * distributionBuilder ) WithDefaultSBOMs () * distributionBuilder {
330
301
b .configFuncs = append (b .configFuncs , func (d * distribution ) {
331
302
d .sboms = b .sboms ()
@@ -361,7 +332,6 @@ func (b *distributionBuilder) WithPackagingDefaults() *distributionBuilder {
361
332
WithDefaultNfpms ().
362
333
WithDefaultMSIConfig ().
363
334
WithDefaultSigns ().
364
- WithDefaultDockerHubs ().
365
335
WithDefaultDockerSigns ().
366
336
WithDefaultSBOMs ()
367
337
}
@@ -413,7 +383,6 @@ type distribution struct {
413
383
containerImageManifests []config.DockerManifest
414
384
signs []config.Sign
415
385
dockerSigns []config.Sign
416
- dockerhubs []config.DockerHub
417
386
sboms []config.SBOM
418
387
checksum config.Checksum
419
388
}
@@ -444,7 +413,6 @@ func (d *distribution) BuildProject() config.Project {
444
413
DockerManifests : d .containerImageManifests ,
445
414
Signs : d .signs ,
446
415
DockerSigns : d .dockerSigns ,
447
- DockerHubs : d .dockerhubs ,
448
416
SBOMs : d .sboms ,
449
417
Version : 2 ,
450
418
Monorepo : config.Monorepo {
0 commit comments