remove sending images to docker hub (#74)

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
jpkrohling · Jun 10, 2024 · 0475db0 · 0475db0
1 parent f5afb57
commit 0475db0
Show file tree

Hide file tree

Showing 7 changed files with 132 additions and 284 deletions.
diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml
@@ -63,12 +63,6 @@ jobs:
       - name: Generate distribution sources
         run: make generate-sources
 
-      - name: Log into Docker.io
-        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
       - name: Login to GitHub Package Registry
         uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
         with:
@@ -138,12 +132,6 @@ jobs:
       - name: Display structure of downloaded files
         run: ls -R distributions/${{ inputs.distribution }}/dist
 
-      - name: Log into Docker.io
-        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
       - name: Login to GitHub Package Registry
         uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
         with:

diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go
@@ -30,7 +30,7 @@ import (
 const ArmArch = "arm"
 
 var (
-	ImagePrefixes = []string{"otel", "ghcr.io/open-telemetry/opentelemetry-collector-releases"}
+	ImagePrefixes = []string{"ghcr.io/jpkrohling/otelcol-distributions"}
 	Architectures = []string{"386", "amd64", "arm", "arm64", "ppc64le", "s390x"}
 	ArmVersions   = []string{"7"}
 )
@@ -112,7 +112,7 @@ func WinPackages(dist string) []config.MSI {
 // https://goreleaser.com/customization/msi/
 func WinPackage(dist string) config.MSI {
 	return config.MSI{
-		ID:      dist,
+		ID:   dist,
 		Name: fmt.Sprintf("%s_{{ .Version }}_{{ .Os }}_{{ .MsiArch }}", dist),
 		WXS:  "windows-installer.wxs",
 		Files: []string{

diff --git a/distributions/otelcol-kafka/.goreleaser.yaml b/distributions/otelcol-kafka/.goreleaser.yaml
@@ -84,10 +84,8 @@ dockers:
     goarch: "386"
     dockerfile: Dockerfile
     image_templates:
-      - otel/opentelemetry-collector-kafka:{{ .Version }}-386
-      - otel/opentelemetry-collector-kafka:latest-386
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:{{ .Version }}-386
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:latest-386
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:{{ .Version }}-386
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:latest-386
     extra_files:
       - config.yaml
     build_flag_templates:
@@ -104,10 +102,8 @@ dockers:
     goarch: amd64
     dockerfile: Dockerfile
     image_templates:
-      - otel/opentelemetry-collector-kafka:{{ .Version }}-amd64
-      - otel/opentelemetry-collector-kafka:latest-amd64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:{{ .Version }}-amd64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:latest-amd64
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:{{ .Version }}-amd64
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:latest-amd64
     extra_files:
       - config.yaml
     build_flag_templates:
@@ -125,10 +121,8 @@ dockers:
     goarm: "7"
     dockerfile: Dockerfile
     image_templates:
-      - otel/opentelemetry-collector-kafka:{{ .Version }}-armv7
-      - otel/opentelemetry-collector-kafka:latest-armv7
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:{{ .Version }}-armv7
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:latest-armv7
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:{{ .Version }}-armv7
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:latest-armv7
     extra_files:
       - config.yaml
     build_flag_templates:
@@ -145,10 +139,8 @@ dockers:
     goarch: arm64
     dockerfile: Dockerfile
     image_templates:
-      - otel/opentelemetry-collector-kafka:{{ .Version }}-arm64
-      - otel/opentelemetry-collector-kafka:latest-arm64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:{{ .Version }}-arm64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:latest-arm64
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:{{ .Version }}-arm64
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:latest-arm64
     extra_files:
       - config.yaml
     build_flag_templates:
@@ -165,10 +157,8 @@ dockers:
     goarch: ppc64le
     dockerfile: Dockerfile
     image_templates:
-      - otel/opentelemetry-collector-kafka:{{ .Version }}-ppc64le
-      - otel/opentelemetry-collector-kafka:latest-ppc64le
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:{{ .Version }}-ppc64le
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:latest-ppc64le
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:{{ .Version }}-ppc64le
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:latest-ppc64le
     extra_files:
       - config.yaml
     build_flag_templates:
@@ -185,10 +175,8 @@ dockers:
     goarch: s390x
     dockerfile: Dockerfile
     image_templates:
-      - otel/opentelemetry-collector-kafka:{{ .Version }}-s390x
-      - otel/opentelemetry-collector-kafka:latest-s390x
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:{{ .Version }}-s390x
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:latest-s390x
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:{{ .Version }}-s390x
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:latest-s390x
     extra_files:
       - config.yaml
     build_flag_templates:
@@ -202,38 +190,22 @@ dockers:
       - --label=org.opencontainers.image.licenses=Apache-2.0
     use: buildx
 docker_manifests:
-  - name_template: otel/opentelemetry-collector-kafka:{{ .Version }}
+  - name_template: ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:{{ .Version }}
     image_templates:
-      - otel/opentelemetry-collector-kafka:{{ .Version }}-386
-      - otel/opentelemetry-collector-kafka:{{ .Version }}-amd64
-      - otel/opentelemetry-collector-kafka:{{ .Version }}-armv7
-      - otel/opentelemetry-collector-kafka:{{ .Version }}-arm64
-      - otel/opentelemetry-collector-kafka:{{ .Version }}-ppc64le
-      - otel/opentelemetry-collector-kafka:{{ .Version }}-s390x
-  - name_template: otel/opentelemetry-collector-kafka:latest
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:{{ .Version }}-386
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:{{ .Version }}-amd64
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:{{ .Version }}-armv7
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:{{ .Version }}-arm64
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:{{ .Version }}-ppc64le
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:{{ .Version }}-s390x
+  - name_template: ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:latest
     image_templates:
-      - otel/opentelemetry-collector-kafka:latest-386
-      - otel/opentelemetry-collector-kafka:latest-amd64
-      - otel/opentelemetry-collector-kafka:latest-armv7
-      - otel/opentelemetry-collector-kafka:latest-arm64
-      - otel/opentelemetry-collector-kafka:latest-ppc64le
-      - otel/opentelemetry-collector-kafka:latest-s390x
-  - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:{{ .Version }}
-    image_templates:
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:{{ .Version }}-386
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:{{ .Version }}-amd64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:{{ .Version }}-armv7
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:{{ .Version }}-arm64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:{{ .Version }}-ppc64le
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:{{ .Version }}-s390x
-  - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:latest
-    image_templates:
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:latest-386
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:latest-amd64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:latest-armv7
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:latest-arm64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:latest-ppc64le
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-kafka:latest-s390x
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:latest-386
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:latest-amd64
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:latest-armv7
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:latest-arm64
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:latest-ppc64le
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-kafka:latest-s390x
 signs:
   - cmd: cosign
     args:

diff --git a/distributions/otelcol-loadbalancer/.goreleaser.yaml b/distributions/otelcol-loadbalancer/.goreleaser.yaml
@@ -84,10 +84,8 @@ dockers:
     goarch: "386"
     dockerfile: Dockerfile
     image_templates:
-      - otel/opentelemetry-collector-loadbalancer:{{ .Version }}-386
-      - otel/opentelemetry-collector-loadbalancer:latest-386
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:{{ .Version }}-386
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:latest-386
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:{{ .Version }}-386
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:latest-386
     extra_files:
       - config.yaml
     build_flag_templates:
@@ -104,10 +102,8 @@ dockers:
     goarch: amd64
     dockerfile: Dockerfile
     image_templates:
-      - otel/opentelemetry-collector-loadbalancer:{{ .Version }}-amd64
-      - otel/opentelemetry-collector-loadbalancer:latest-amd64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:{{ .Version }}-amd64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:latest-amd64
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:{{ .Version }}-amd64
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:latest-amd64
     extra_files:
       - config.yaml
     build_flag_templates:
@@ -125,10 +121,8 @@ dockers:
     goarm: "7"
     dockerfile: Dockerfile
     image_templates:
-      - otel/opentelemetry-collector-loadbalancer:{{ .Version }}-armv7
-      - otel/opentelemetry-collector-loadbalancer:latest-armv7
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:{{ .Version }}-armv7
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:latest-armv7
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:{{ .Version }}-armv7
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:latest-armv7
     extra_files:
       - config.yaml
     build_flag_templates:
@@ -145,10 +139,8 @@ dockers:
     goarch: arm64
     dockerfile: Dockerfile
     image_templates:
-      - otel/opentelemetry-collector-loadbalancer:{{ .Version }}-arm64
-      - otel/opentelemetry-collector-loadbalancer:latest-arm64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:{{ .Version }}-arm64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:latest-arm64
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:{{ .Version }}-arm64
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:latest-arm64
     extra_files:
       - config.yaml
     build_flag_templates:
@@ -165,10 +157,8 @@ dockers:
     goarch: ppc64le
     dockerfile: Dockerfile
     image_templates:
-      - otel/opentelemetry-collector-loadbalancer:{{ .Version }}-ppc64le
-      - otel/opentelemetry-collector-loadbalancer:latest-ppc64le
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:{{ .Version }}-ppc64le
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:latest-ppc64le
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:{{ .Version }}-ppc64le
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:latest-ppc64le
     extra_files:
       - config.yaml
     build_flag_templates:
@@ -185,10 +175,8 @@ dockers:
     goarch: s390x
     dockerfile: Dockerfile
     image_templates:
-      - otel/opentelemetry-collector-loadbalancer:{{ .Version }}-s390x
-      - otel/opentelemetry-collector-loadbalancer:latest-s390x
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:{{ .Version }}-s390x
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:latest-s390x
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:{{ .Version }}-s390x
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:latest-s390x
     extra_files:
       - config.yaml
     build_flag_templates:
@@ -202,38 +190,22 @@ dockers:
       - --label=org.opencontainers.image.licenses=Apache-2.0
     use: buildx
 docker_manifests:
-  - name_template: otel/opentelemetry-collector-loadbalancer:{{ .Version }}
+  - name_template: ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:{{ .Version }}
     image_templates:
-      - otel/opentelemetry-collector-loadbalancer:{{ .Version }}-386
-      - otel/opentelemetry-collector-loadbalancer:{{ .Version }}-amd64
-      - otel/opentelemetry-collector-loadbalancer:{{ .Version }}-armv7
-      - otel/opentelemetry-collector-loadbalancer:{{ .Version }}-arm64
-      - otel/opentelemetry-collector-loadbalancer:{{ .Version }}-ppc64le
-      - otel/opentelemetry-collector-loadbalancer:{{ .Version }}-s390x
-  - name_template: otel/opentelemetry-collector-loadbalancer:latest
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:{{ .Version }}-386
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:{{ .Version }}-amd64
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:{{ .Version }}-armv7
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:{{ .Version }}-arm64
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:{{ .Version }}-ppc64le
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:{{ .Version }}-s390x
+  - name_template: ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:latest
     image_templates:
-      - otel/opentelemetry-collector-loadbalancer:latest-386
-      - otel/opentelemetry-collector-loadbalancer:latest-amd64
-      - otel/opentelemetry-collector-loadbalancer:latest-armv7
-      - otel/opentelemetry-collector-loadbalancer:latest-arm64
-      - otel/opentelemetry-collector-loadbalancer:latest-ppc64le
-      - otel/opentelemetry-collector-loadbalancer:latest-s390x
-  - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:{{ .Version }}
-    image_templates:
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:{{ .Version }}-386
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:{{ .Version }}-amd64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:{{ .Version }}-armv7
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:{{ .Version }}-arm64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:{{ .Version }}-ppc64le
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:{{ .Version }}-s390x
-  - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:latest
-    image_templates:
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:latest-386
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:latest-amd64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:latest-armv7
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:latest-arm64
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:latest-ppc64le
-      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-loadbalancer:latest-s390x
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:latest-386
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:latest-amd64
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:latest-armv7
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:latest-arm64
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:latest-ppc64le
+      - ghcr.io/jpkrohling/otelcol-distributions/opentelemetry-collector-loadbalancer:latest-s390x
 signs:
   - cmd: cosign
     args: