Skip to content

Commit 680618b

Browse files
mowiesmowies
committed
revert debugging changes for builder and opamp
1 parent 46c364b commit 680618b

File tree

2 files changed

+60
-60
lines changed

2 files changed

+60
-60
lines changed

‎cmd/builder/.goreleaser.yml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ dockers:
3232
goarch: amd64
3333
dockerfile: Dockerfile
3434
image_templates:
35-
# - mowies/opentelemetry-collector-builder:{{ .Version }}-amd64
36-
# - mowies/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
37-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64
38-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
35+
- otel/opentelemetry-collector-builder:{{ .Version }}-amd64
36+
- otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
37+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64
38+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
3939
build_flag_templates:
4040
- --pull
4141
- --platform=linux/amd64
@@ -49,10 +49,10 @@ dockers:
4949
goarch: arm64
5050
dockerfile: Dockerfile
5151
image_templates:
52-
# - mowies/opentelemetry-collector-builder:{{ .Version }}-arm64
53-
# - mowies/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
54-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64
55-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
52+
- otel/opentelemetry-collector-builder:{{ .Version }}-arm64
53+
- otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
54+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64
55+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
5656
build_flag_templates:
5757
- --pull
5858
- --platform=linux/arm64
@@ -66,10 +66,10 @@ dockers:
6666
goarch: ppc64le
6767
dockerfile: Dockerfile
6868
image_templates:
69-
# - mowies/opentelemetry-collector-builder:{{ .Version }}-ppc64le
70-
# - mowies/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
71-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le
72-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
69+
- otel/opentelemetry-collector-builder:{{ .Version }}-ppc64le
70+
- otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
71+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le
72+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
7373
build_flag_templates:
7474
- --pull
7575
- --platform=linux/ppc64le
@@ -81,26 +81,26 @@ dockers:
8181
- --label=org.opencontainers.image.licenses=Apache-2.0
8282
use: buildx
8383
docker_manifests:
84-
# - name_template: mowies/opentelemetry-collector-builder:{{ .Version }}
85-
# image_templates:
86-
# - mowies/opentelemetry-collector-builder:{{ .Version }}-amd64
87-
# - mowies/opentelemetry-collector-builder:{{ .Version }}-arm64
88-
# - mowies/opentelemetry-collector-builder:{{ .Version }}-ppc64le
89-
# - name_template: mowies/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}
90-
# image_templates:
91-
# - mowies/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
92-
# - mowies/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
93-
# - mowies/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
94-
- name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}
84+
- name_template: otel/opentelemetry-collector-builder:{{ .Version }}
9585
image_templates:
96-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64
97-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64
98-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le
99-
- name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}
86+
- otel/opentelemetry-collector-builder:{{ .Version }}-amd64
87+
- otel/opentelemetry-collector-builder:{{ .Version }}-arm64
88+
- otel/opentelemetry-collector-builder:{{ .Version }}-ppc64le
89+
- name_template: otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}
10090
image_templates:
101-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
102-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
103-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-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
94+
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}
95+
image_templates:
96+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64
97+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64
98+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le
99+
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}
100+
image_templates:
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
104104
release:
105105
make_latest: false
106106
header: |

‎cmd/opampsupervisor/.goreleaser.yml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ dockers:
3232
goarch: amd64
3333
dockerfile: Dockerfile
3434
image_templates:
35-
# - mowies/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
36-
# - mowies/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
37-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
38-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
35+
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
36+
- otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
37+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
38+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
3939
build_flag_templates:
4040
- --pull
4141
- --platform=linux/amd64
@@ -49,10 +49,10 @@ dockers:
4949
goarch: arm64
5050
dockerfile: Dockerfile
5151
image_templates:
52-
# - mowies/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
53-
# - mowies/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
54-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
55-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
52+
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
53+
- otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
54+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
55+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
5656
build_flag_templates:
5757
- --pull
5858
- --platform=linux/arm64
@@ -66,10 +66,10 @@ dockers:
6666
goarch: ppc64le
6767
dockerfile: Dockerfile
6868
image_templates:
69-
# - mowies/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
70-
# - mowies/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
71-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
72-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
69+
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
70+
- otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
71+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
72+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
7373
build_flag_templates:
7474
- --pull
7575
- --platform=linux/ppc64le
@@ -81,26 +81,26 @@ dockers:
8181
- --label=org.opencontainers.image.licenses=Apache-2.0
8282
use: buildx
8383
docker_manifests:
84-
# - name_template: mowies/opentelemetry-collector-opampsupervisor:{{ .Version }}
85-
# image_templates:
86-
# - mowies/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
87-
# - mowies/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
88-
# - mowies/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
89-
# - name_template: mowies/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}
90-
# image_templates:
91-
# - mowies/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
92-
# - mowies/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
93-
# - mowies/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le
94-
- name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}
84+
- name_template: otel/opentelemetry-collector-opampsupervisor:{{ .Version }}
9585
image_templates:
96-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
97-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
98-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
99-
- name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}
86+
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
87+
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
88+
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
89+
- name_template: otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}
10090
image_templates:
101-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64
102-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64
103-
- ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-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
94+
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}
95+
image_templates:
96+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
97+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
98+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
99+
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}
100+
image_templates:
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
104104
release:
105105
make_latest: false
106106
header: |

0 commit comments

Comments
 (0)