From f9dbb1b82ca3a184fa3078d3073a1024bbbe10e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= <juraci@kroehling.de>
Date: Wed, 8 Sep 2021 11:28:48 +0200
Subject: [PATCH] Publish images to opentelemetry namespaces (#15)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Publish images to opentelemetry namespaces
Fixes #14

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>

* Removed quay

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>

* Change release action

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
---
 .github/workflows/release.yaml                              | 4 ++--
 .goreleaser.yaml                                            | 6 +++---
 scripts/goreleaser-templates/docker-manifests.template.yaml | 4 ++--
 scripts/goreleaser-templates/docker.template.yaml           | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 0d32075cd..fb5425501 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -24,8 +24,8 @@ jobs:
       - name: Generate distribution sources
         run: make generate-sources
 
-      - name: Log into Quay.io
-        run: echo "${{ secrets.QUAY_PASSWORD }}" | docker login quay.io -u ${{ secrets.QUAY_USERNAME }} --password-stdin
+      - name: Log into Docker.io
+        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
 
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 06bbc3fbc..e0e53fd54 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -35,12 +35,12 @@ builds:
       - goos: windows
         goarch: arm64
 docker_manifests:
-  - name_template: quay.io/jpkroehling/otelcol:{{ .Tag }}
+  - name_template: otel/otelcol:{{ .Tag }}
     image_templates:
-      - quay.io/jpkroehling/otelcol:{{ .Tag }}-amd64
+      - otel/otelcol:{{ .Tag }}-amd64
 dockers:
   - image_templates:
-      - "quay.io/jpkroehling/otelcol:{{ .Tag }}-amd64"
+      - "otel/otelcol:{{ .Tag }}-amd64"
     dockerfile: "distributions/otelcol/Dockerfile"
     use: buildx
     build_flag_templates:
diff --git a/scripts/goreleaser-templates/docker-manifests.template.yaml b/scripts/goreleaser-templates/docker-manifests.template.yaml
index 4aeb40b29..55d0f566f 100644
--- a/scripts/goreleaser-templates/docker-manifests.template.yaml
+++ b/scripts/goreleaser-templates/docker-manifests.template.yaml
@@ -1,4 +1,4 @@
 docker_manifests:
-  - name_template: quay.io/jpkroehling/{distribution}:{{ .Tag }}
+  - name_template: otel/{distribution}:{{ .Tag }}
     image_templates:
-      - quay.io/jpkroehling/{distribution}:{{ .Tag }}-amd64
+      - otel/{distribution}:{{ .Tag }}-amd64
diff --git a/scripts/goreleaser-templates/docker.template.yaml b/scripts/goreleaser-templates/docker.template.yaml
index efb22ccda..787da6ec8 100644
--- a/scripts/goreleaser-templates/docker.template.yaml
+++ b/scripts/goreleaser-templates/docker.template.yaml
@@ -1,6 +1,6 @@
 dockers:
 - image_templates:
-    - "quay.io/jpkroehling/{distribution}:{{ .Tag }}-amd64"
+    - "otel/{distribution}:{{ .Tag }}-amd64"
   dockerfile: "distributions/{distribution}/Dockerfile"
   use: buildx
   build_flag_templates: