From 574b913c61a392b5c7fc12b4965dfd8b97eed06f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= <juraci@kroehling.de>
Date: Wed, 6 Oct 2021 14:42:22 +0200
Subject: [PATCH] Remove 'v' from the container image version (#26)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #25

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

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index e51d436b..b98bb064 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -35,12 +35,12 @@ builds:
       - goos: windows
         goarch: arm64
 docker_manifests:
-  - name_template: otel/opentelemetry-collector:{{ .Tag }}
+  - name_template: otel/opentelemetry-collector:{{ .Version }}
     image_templates:
-      - otel/opentelemetry-collector:{{ .Tag }}-amd64
+      - otel/opentelemetry-collector:{{ .Version }}-amd64
 dockers:
   - image_templates:
-      - "otel/opentelemetry-collector:{{ .Tag }}-amd64"
+      - "otel/opentelemetry-collector:{{ .Version }}-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 ec9ff34a..ef5fe013 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: ${CONTAINER_BASE_NAME}:{{ .Tag }}
+  - name_template: ${CONTAINER_BASE_NAME}:{{ .Version }}
     image_templates:
-      - ${CONTAINER_BASE_NAME}:{{ .Tag }}-amd64
+      - ${CONTAINER_BASE_NAME}:{{ .Version }}-amd64
diff --git a/scripts/goreleaser-templates/docker.template.yaml b/scripts/goreleaser-templates/docker.template.yaml
index 423bbde1..78f9cbf7 100644
--- a/scripts/goreleaser-templates/docker.template.yaml
+++ b/scripts/goreleaser-templates/docker.template.yaml
@@ -1,6 +1,6 @@
 dockers:
 - image_templates:
-    - "${CONTAINER_BASE_NAME}:{{ .Tag }}-amd64"
+    - "${CONTAINER_BASE_NAME}:{{ .Version }}-amd64"
   dockerfile: "distributions/{distribution}/Dockerfile"
   use: buildx
   build_flag_templates: