Fix docker tag

open-telemetry · Jul 7, 2023 · e2cf480 · e2cf480
1 parent 145f6ed
commit e2cf480
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -168,10 +168,10 @@ dockers:
       goarm: "7"
       dockerfile: distributions/otelcol/Dockerfile
       image_templates:
-        - otel/opentelemetry-collector:{{ .Version }}-arm/v7
-        - otel/opentelemetry-collector:latest-arm/v7
-        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-arm/v7
-        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-arm/v7
+        - otel/opentelemetry-collector:{{ .Version }}-armv7
+        - otel/opentelemetry-collector:latest-armv7
+        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-armv7
+        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-armv7
       extra_files:
         - configs/otelcol.yaml
       build_flag_templates:
@@ -264,10 +264,10 @@ dockers:
       goarm: "7"
       dockerfile: distributions/otelcol-contrib/Dockerfile
       image_templates:
-        - otel/opentelemetry-collector-contrib:{{ .Version }}-arm/v7
-        - otel/opentelemetry-collector-contrib:latest-arm/v7
-        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm/v7
-        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-arm/v7
+        - otel/opentelemetry-collector-contrib:{{ .Version }}-armv7
+        - otel/opentelemetry-collector-contrib:latest-armv7
+        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7
+        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-armv7
       extra_files:
         - configs/otelcol-contrib.yaml
       build_flag_templates:
@@ -322,55 +322,55 @@ docker_manifests:
       image_templates:
         - otel/opentelemetry-collector:{{ .Version }}-386
         - otel/opentelemetry-collector:{{ .Version }}-amd64
-        - otel/opentelemetry-collector:{{ .Version }}-arm/v7
+        - otel/opentelemetry-collector:{{ .Version }}-armv7
         - otel/opentelemetry-collector:{{ .Version }}-arm64
         - otel/opentelemetry-collector:{{ .Version }}-ppc64le
     - name_template: otel/opentelemetry-collector:latest
       image_templates:
         - otel/opentelemetry-collector:latest-386
         - otel/opentelemetry-collector:latest-amd64
-        - otel/opentelemetry-collector:latest-arm/v7
+        - otel/opentelemetry-collector:latest-armv7
         - otel/opentelemetry-collector:latest-arm64
         - otel/opentelemetry-collector:latest-ppc64le
     - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}
       image_templates:
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-386
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-amd64
-        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-arm/v7
+        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-armv7
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-arm64
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-ppc64le
     - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest
       image_templates:
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-386
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-amd64
-        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-arm/v7
+        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-armv7
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-arm64
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-ppc64le
     - name_template: otel/opentelemetry-collector-contrib:{{ .Version }}
       image_templates:
         - otel/opentelemetry-collector-contrib:{{ .Version }}-386
         - otel/opentelemetry-collector-contrib:{{ .Version }}-amd64
-        - otel/opentelemetry-collector-contrib:{{ .Version }}-arm/v7
+        - otel/opentelemetry-collector-contrib:{{ .Version }}-armv7
         - otel/opentelemetry-collector-contrib:{{ .Version }}-arm64
         - otel/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
     - name_template: otel/opentelemetry-collector-contrib:latest
       image_templates:
         - otel/opentelemetry-collector-contrib:latest-386
         - otel/opentelemetry-collector-contrib:latest-amd64
-        - otel/opentelemetry-collector-contrib:latest-arm/v7
+        - otel/opentelemetry-collector-contrib:latest-armv7
         - otel/opentelemetry-collector-contrib:latest-arm64
         - otel/opentelemetry-collector-contrib:latest-ppc64le
     - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}
       image_templates:
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64
-        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm/v7
+        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
     - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest
       image_templates:
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-386
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-amd64
-        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-arm/v7
+        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-armv7
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-arm64
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-ppc64le
diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go
@@ -167,10 +167,11 @@ func DockerImage(imagePrefixes []string, dist, arch, armVersion string) config.D
 	dockerArchName := archName(arch, armVersion)
 	var imageTemplates []string
 	for _, prefix := range imagePrefixes {
+		dockerArchTag := strings.ReplaceAll(dockerArchName, "/", "")
 		imageTemplates = append(
 			imageTemplates,
-			fmt.Sprintf("%s/%s:{{ .Version }}-%s", prefix, imageName(dist), dockerArchName),
-			fmt.Sprintf("%s/%s:latest-%s", prefix, imageName(dist), dockerArchName),
+			fmt.Sprintf("%s/%s:{{ .Version }}-%s", prefix, imageName(dist), dockerArchTag),
+			fmt.Sprintf("%s/%s:latest-%s", prefix, imageName(dist), dockerArchTag),
 		)
 	}
 
@@ -217,9 +218,10 @@ func DockerManifest(prefix, version, dist string) config.DockerManifest {
 		switch arch {
 		case ArmArch:
 			for _, armVers := range ArmVersions {
+				dockerArchTag := strings.ReplaceAll(archName(arch, armVers), "/", "")
 				imageTemplates = append(
 					imageTemplates,
-					fmt.Sprintf("%s/%s:%s-%s", prefix, imageName(dist), version, archName(arch, armVers)),
+					fmt.Sprintf("%s/%s:%s-%s", prefix, imageName(dist), version, dockerArchTag),
 				)
 			}
 		default: