From e594392f9763d21b9d82f9d31ddb895bf282659d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= Date: Tue, 7 Sep 2021 13:32:38 +0200 Subject: [PATCH 1/3] Publish images to opentelemetry namespaces Fixes #14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juraci Paixão Kröhling --- .goreleaser.yaml | 10 +++++++--- .../docker-manifests.template.yaml | 7 +++++-- scripts/goreleaser-templates/docker.template.yaml | 3 ++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 06bbc3fb..f203362d 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -35,12 +35,16 @@ builds: - goos: windows goarch: arm64 docker_manifests: - - name_template: quay.io/jpkroehling/otelcol:{{ .Tag }} + - name_template: quay.io/opentelemetry/otelcol:{{ .Tag }} image_templates: - - quay.io/jpkroehling/otelcol:{{ .Tag }}-amd64 + - quay.io/opentelemetry/otelcol:{{ .Tag }}-amd64 + - name_template: docker.io/otel/otelcol:{{ .Tag }} + image_templates: + - docker.io/otel/otelcol:{{ .Tag }}-amd64 dockers: - image_templates: - - "quay.io/jpkroehling/otelcol:{{ .Tag }}-amd64" + - "quay.io/opentelemetry/otelcol:{{ .Tag }}-amd64" + - "docker.io/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 4aeb40b2..a7cabe9f 100644 --- a/scripts/goreleaser-templates/docker-manifests.template.yaml +++ b/scripts/goreleaser-templates/docker-manifests.template.yaml @@ -1,4 +1,7 @@ docker_manifests: - - name_template: quay.io/jpkroehling/{distribution}:{{ .Tag }} + - name_template: quay.io/opentelemetry/{distribution}:{{ .Tag }} image_templates: - - quay.io/jpkroehling/{distribution}:{{ .Tag }}-amd64 + - quay.io/opentelemetry/{distribution}:{{ .Tag }}-amd64 + - name_template: docker.io/otel/{distribution}:{{ .Tag }} + image_templates: + - docker.io/otel/{distribution}:{{ .Tag }}-amd64 diff --git a/scripts/goreleaser-templates/docker.template.yaml b/scripts/goreleaser-templates/docker.template.yaml index efb22ccd..7c034281 100644 --- a/scripts/goreleaser-templates/docker.template.yaml +++ b/scripts/goreleaser-templates/docker.template.yaml @@ -1,6 +1,7 @@ dockers: - image_templates: - - "quay.io/jpkroehling/{distribution}:{{ .Tag }}-amd64" + - "quay.io/opentelemetry/{distribution}:{{ .Tag }}-amd64" + - "docker.io/otel/{distribution}:{{ .Tag }}-amd64" dockerfile: "distributions/{distribution}/Dockerfile" use: buildx build_flag_templates: From 4cca70e5082838a9ac2cee11422d7289d1d5a250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= Date: Tue, 7 Sep 2021 13:52:44 +0200 Subject: [PATCH 2/3] Removed quay MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juraci Paixão Kröhling --- .goreleaser.yaml | 10 +++------- .../docker-manifests.template.yaml | 7 ++----- scripts/goreleaser-templates/docker.template.yaml | 3 +-- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index f203362d..e0e53fd5 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -35,16 +35,12 @@ builds: - goos: windows goarch: arm64 docker_manifests: - - name_template: quay.io/opentelemetry/otelcol:{{ .Tag }} + - name_template: otel/otelcol:{{ .Tag }} image_templates: - - quay.io/opentelemetry/otelcol:{{ .Tag }}-amd64 - - name_template: docker.io/otel/otelcol:{{ .Tag }} - image_templates: - - docker.io/otel/otelcol:{{ .Tag }}-amd64 + - otel/otelcol:{{ .Tag }}-amd64 dockers: - image_templates: - - "quay.io/opentelemetry/otelcol:{{ .Tag }}-amd64" - - "docker.io/otel/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 a7cabe9f..55d0f566 100644 --- a/scripts/goreleaser-templates/docker-manifests.template.yaml +++ b/scripts/goreleaser-templates/docker-manifests.template.yaml @@ -1,7 +1,4 @@ docker_manifests: - - name_template: quay.io/opentelemetry/{distribution}:{{ .Tag }} + - name_template: otel/{distribution}:{{ .Tag }} image_templates: - - quay.io/opentelemetry/{distribution}:{{ .Tag }}-amd64 - - name_template: docker.io/otel/{distribution}:{{ .Tag }} - image_templates: - - docker.io/otel/{distribution}:{{ .Tag }}-amd64 + - otel/{distribution}:{{ .Tag }}-amd64 diff --git a/scripts/goreleaser-templates/docker.template.yaml b/scripts/goreleaser-templates/docker.template.yaml index 7c034281..787da6ec 100644 --- a/scripts/goreleaser-templates/docker.template.yaml +++ b/scripts/goreleaser-templates/docker.template.yaml @@ -1,7 +1,6 @@ dockers: - image_templates: - - "quay.io/opentelemetry/{distribution}:{{ .Tag }}-amd64" - - "docker.io/otel/{distribution}:{{ .Tag }}-amd64" + - "otel/{distribution}:{{ .Tag }}-amd64" dockerfile: "distributions/{distribution}/Dockerfile" use: buildx build_flag_templates: From 824e5a413a0bd4bd17d1407fa7d1a2d8662243b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= Date: Wed, 8 Sep 2021 10:04:30 +0200 Subject: [PATCH 3/3] Change release action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juraci Paixão Kröhling --- .github/workflows/release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 0d32075c..fb542550 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