Skip to content

Commit b93543b

Browse files
dmitryaxdmitryax
authored
Revert "Remove dockerhub destination (#902)" (#938)
* Revert "Remove dockerhub destination (#902)" This reverts commit 0c9c516. * add changelog * make generate-goreleaser
1 parent 0e46b77 commit b93543b

File tree

9 files changed

+178
-4
lines changed

9 files changed

+178
-4
lines changed

‎.chloggen/bring-back-docker-builds.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: image repository
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Re-enable publishing images to dockerhub
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [938]

‎cmd/builder/.goreleaser.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ dockers:
3030
goarch: amd64
3131
dockerfile: Dockerfile
3232
image_templates:
33+
- otel/opentelemetry-collector-builder:{{ .Version }}-amd64
34+
- otel/opentelemetry-collector-builder:latest-amd64
3335
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64
3436
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-amd64
3537
build_flag_templates:
@@ -45,6 +47,8 @@ dockers:
4547
goarch: arm64
4648
dockerfile: Dockerfile
4749
image_templates:
50+
- otel/opentelemetry-collector-builder:{{ .Version }}-arm64
51+
- otel/opentelemetry-collector-builder:latest-arm64
4852
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64
4953
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-arm64
5054
build_flag_templates:
@@ -60,6 +64,8 @@ dockers:
6064
goarch: ppc64le
6165
dockerfile: Dockerfile
6266
image_templates:
67+
- otel/opentelemetry-collector-builder:{{ .Version }}-ppc64le
68+
- otel/opentelemetry-collector-builder:latest-ppc64le
6369
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le
6470
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-ppc64le
6571
build_flag_templates:
@@ -73,6 +79,16 @@ dockers:
7379
- --label=org.opencontainers.image.licenses=Apache-2.0
7480
use: buildx
7581
docker_manifests:
82+
- name_template: otel/opentelemetry-collector-builder:{{ .Version }}
83+
image_templates:
84+
- otel/opentelemetry-collector-builder:{{ .Version }}-amd64
85+
- otel/opentelemetry-collector-builder:{{ .Version }}-arm64
86+
- otel/opentelemetry-collector-builder:{{ .Version }}-ppc64le
87+
- name_template: otel/opentelemetry-collector-builder:latest
88+
image_templates:
89+
- otel/opentelemetry-collector-builder:latest-amd64
90+
- otel/opentelemetry-collector-builder:latest-arm64
91+
- otel/opentelemetry-collector-builder:latest-ppc64le
7692
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}
7793
image_templates:
7894
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64

‎cmd/goreleaser/internal/configure.go‎

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

4344
var (
@@ -48,7 +49,7 @@ var (
4849
k8sArchs = []string{"amd64", "arm64", "ppc64le", "s390x"}
4950
ebpfProfilerArchs = []string{"amd64"}
5051

51-
imageRepos = []string{ghcr}
52+
imageRepos = []string{dockerHub, ghcr}
5253

5354
// otelcol (core) distro
5455
otelColDist = newDistributionBuilder(coreDistro).WithConfigFunc(func(d *distribution) {

‎cmd/opampsupervisor/.goreleaser.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ dockers:
3030
goarch: amd64
3131
dockerfile: Dockerfile
3232
image_templates:
33+
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
34+
- otel/opentelemetry-collector-opampsupervisor:latest-amd64
3335
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
3436
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-amd64
3537
build_flag_templates:
@@ -45,6 +47,8 @@ dockers:
4547
goarch: arm64
4648
dockerfile: Dockerfile
4749
image_templates:
50+
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
51+
- otel/opentelemetry-collector-opampsupervisor:latest-arm64
4852
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
4953
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-arm64
5054
build_flag_templates:
@@ -60,6 +64,8 @@ dockers:
6064
goarch: ppc64le
6165
dockerfile: Dockerfile
6266
image_templates:
67+
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
68+
- otel/opentelemetry-collector-opampsupervisor:latest-ppc64le
6369
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
6470
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-ppc64le
6571
build_flag_templates:
@@ -73,6 +79,16 @@ dockers:
7379
- --label=org.opencontainers.image.licenses=Apache-2.0
7480
use: buildx
7581
docker_manifests:
82+
- name_template: otel/opentelemetry-collector-opampsupervisor:{{ .Version }}
83+
image_templates:
84+
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
85+
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
86+
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
87+
- name_template: otel/opentelemetry-collector-opampsupervisor:latest
88+
image_templates:
89+
- otel/opentelemetry-collector-opampsupervisor:latest-amd64
90+
- otel/opentelemetry-collector-opampsupervisor:latest-arm64
91+
- otel/opentelemetry-collector-opampsupervisor:latest-ppc64le
7692
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}
7793
image_templates:
7894
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ dockers:
107107
goarch: "386"
108108
dockerfile: Dockerfile
109109
image_templates:
110+
- otel/opentelemetry-collector-contrib:{{ .Version }}-386
111+
- otel/opentelemetry-collector-contrib:latest-386
110112
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386
111113
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-386
112114
extra_files:
@@ -125,6 +127,8 @@ dockers:
125127
goarch: amd64
126128
dockerfile: Dockerfile
127129
image_templates:
130+
- otel/opentelemetry-collector-contrib:{{ .Version }}-amd64
131+
- otel/opentelemetry-collector-contrib:latest-amd64
128132
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64
129133
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-amd64
130134
extra_files:
@@ -144,6 +148,8 @@ dockers:
144148
goarm: "7"
145149
dockerfile: Dockerfile
146150
image_templates:
151+
- otel/opentelemetry-collector-contrib:{{ .Version }}-armv7
152+
- otel/opentelemetry-collector-contrib:latest-armv7
147153
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7
148154
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-armv7
149155
extra_files:
@@ -162,6 +168,8 @@ dockers:
162168
goarch: arm64
163169
dockerfile: Dockerfile
164170
image_templates:
171+
- otel/opentelemetry-collector-contrib:{{ .Version }}-arm64
172+
- otel/opentelemetry-collector-contrib:latest-arm64
165173
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64
166174
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-arm64
167175
extra_files:
@@ -180,6 +188,8 @@ dockers:
180188
goarch: ppc64le
181189
dockerfile: Dockerfile
182190
image_templates:
191+
- otel/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
192+
- otel/opentelemetry-collector-contrib:latest-ppc64le
183193
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
184194
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-ppc64le
185195
extra_files:
@@ -198,6 +208,8 @@ dockers:
198208
goarch: s390x
199209
dockerfile: Dockerfile
200210
image_templates:
211+
- otel/opentelemetry-collector-contrib:{{ .Version }}-s390x
212+
- otel/opentelemetry-collector-contrib:latest-s390x
201213
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-s390x
202214
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-s390x
203215
extra_files:
@@ -216,6 +228,8 @@ dockers:
216228
goarch: amd64
217229
dockerfile: Windows.dockerfile
218230
image_templates:
231+
- otel/opentelemetry-collector-contrib:{{ .Version }}-windows-2019-amd64
232+
- otel/opentelemetry-collector-contrib:latest-windows-2019-amd64
219233
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-windows-2019-amd64
220234
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-windows-2019-amd64
221235
skip_build: '{{ not (eq .Runtime.Goos "windows") }}'
@@ -237,6 +251,8 @@ dockers:
237251
goarch: amd64
238252
dockerfile: Windows.dockerfile
239253
image_templates:
254+
- otel/opentelemetry-collector-contrib:{{ .Version }}-windows-2022-amd64
255+
- otel/opentelemetry-collector-contrib:latest-windows-2022-amd64
240256
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-windows-2022-amd64
241257
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-windows-2022-amd64
242258
skip_build: '{{ not (eq .Runtime.Goos "windows") }}'
@@ -255,6 +271,22 @@ dockers:
255271
- --label=org.opencontainers.image.licenses=Apache-2.0
256272
use: docker
257273
docker_manifests:
274+
- name_template: otel/opentelemetry-collector-contrib:{{ .Version }}
275+
image_templates:
276+
- otel/opentelemetry-collector-contrib:{{ .Version }}-386
277+
- otel/opentelemetry-collector-contrib:{{ .Version }}-amd64
278+
- otel/opentelemetry-collector-contrib:{{ .Version }}-armv7
279+
- otel/opentelemetry-collector-contrib:{{ .Version }}-arm64
280+
- otel/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
281+
- otel/opentelemetry-collector-contrib:{{ .Version }}-s390x
282+
- name_template: otel/opentelemetry-collector-contrib:latest
283+
image_templates:
284+
- otel/opentelemetry-collector-contrib:latest-386
285+
- otel/opentelemetry-collector-contrib:latest-amd64
286+
- otel/opentelemetry-collector-contrib:latest-armv7
287+
- otel/opentelemetry-collector-contrib:latest-arm64
288+
- otel/opentelemetry-collector-contrib:latest-ppc64le
289+
- otel/opentelemetry-collector-contrib:latest-s390x
258290
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}
259291
image_templates:
260292
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386

‎distributions/otelcol-ebpf-profiler/.goreleaser.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ dockers:
3131
goarch: amd64
3232
dockerfile: Dockerfile
3333
image_templates:
34+
- otel/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64
35+
- otel/opentelemetry-collector-ebpf-profiler:latest-amd64
3436
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64
3537
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:latest-amd64
3638
build_flag_templates:
@@ -44,6 +46,12 @@ dockers:
4446
- --label=org.opencontainers.image.licenses=Apache-2.0
4547
use: buildx
4648
docker_manifests:
49+
- name_template: otel/opentelemetry-collector-ebpf-profiler:{{ .Version }}
50+
image_templates:
51+
- otel/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64
52+
- name_template: otel/opentelemetry-collector-ebpf-profiler:latest
53+
image_templates:
54+
- otel/opentelemetry-collector-ebpf-profiler:latest-amd64
4755
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Version }}
4856
image_templates:
4957
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64

‎distributions/otelcol-k8s/.goreleaser.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ dockers:
4848
goarch: amd64
4949
dockerfile: Dockerfile
5050
image_templates:
51+
- otel/opentelemetry-collector-k8s:{{ .Version }}-amd64
52+
- otel/opentelemetry-collector-k8s:latest-amd64
5153
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-amd64
5254
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-amd64
5355
build_flag_templates:
@@ -64,6 +66,8 @@ dockers:
6466
goarch: arm64
6567
dockerfile: Dockerfile
6668
image_templates:
69+
- otel/opentelemetry-collector-k8s:{{ .Version }}-arm64
70+
- otel/opentelemetry-collector-k8s:latest-arm64
6771
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-arm64
6872
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-arm64
6973
build_flag_templates:
@@ -80,6 +84,8 @@ dockers:
8084
goarch: ppc64le
8185
dockerfile: Dockerfile
8286
image_templates:
87+
- otel/opentelemetry-collector-k8s:{{ .Version }}-ppc64le
88+
- otel/opentelemetry-collector-k8s:latest-ppc64le
8389
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-ppc64le
8490
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-ppc64le
8591
build_flag_templates:
@@ -96,6 +102,8 @@ dockers:
96102
goarch: s390x
97103
dockerfile: Dockerfile
98104
image_templates:
105+
- otel/opentelemetry-collector-k8s:{{ .Version }}-s390x
106+
- otel/opentelemetry-collector-k8s:latest-s390x
99107
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-s390x
100108
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-s390x
101109
build_flag_templates:
@@ -112,6 +120,8 @@ dockers:
112120
goarch: amd64
113121
dockerfile: Windows.dockerfile
114122
image_templates:
123+
- otel/opentelemetry-collector-k8s:{{ .Version }}-windows-2019-amd64
124+
- otel/opentelemetry-collector-k8s:latest-windows-2019-amd64
115125
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-windows-2019-amd64
116126
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-windows-2019-amd64
117127
skip_build: '{{ not (eq .Runtime.Goos "windows") }}'
@@ -131,6 +141,8 @@ dockers:
131141
goarch: amd64
132142
dockerfile: Windows.dockerfile
133143
image_templates:
144+
- otel/opentelemetry-collector-k8s:{{ .Version }}-windows-2022-amd64
145+
- otel/opentelemetry-collector-k8s:latest-windows-2022-amd64
134146
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-windows-2022-amd64
135147
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-windows-2022-amd64
136148
skip_build: '{{ not (eq .Runtime.Goos "windows") }}'
@@ -147,6 +159,18 @@ dockers:
147159
- --label=org.opencontainers.image.licenses=Apache-2.0
148160
use: docker
149161
docker_manifests:
162+
- name_template: otel/opentelemetry-collector-k8s:{{ .Version }}
163+
image_templates:
164+
- otel/opentelemetry-collector-k8s:{{ .Version }}-amd64
165+
- otel/opentelemetry-collector-k8s:{{ .Version }}-arm64
166+
- otel/opentelemetry-collector-k8s:{{ .Version }}-ppc64le
167+
- otel/opentelemetry-collector-k8s:{{ .Version }}-s390x
168+
- name_template: otel/opentelemetry-collector-k8s:latest
169+
image_templates:
170+
- otel/opentelemetry-collector-k8s:latest-amd64
171+
- otel/opentelemetry-collector-k8s:latest-arm64
172+
- otel/opentelemetry-collector-k8s:latest-ppc64le
173+
- otel/opentelemetry-collector-k8s:latest-s390x
150174
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}
151175
image_templates:
152176
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-amd64

0 commit comments

Comments
 (0)