fix image tag for ci

chatwork · Nov 29, 2023 · 187ffc2 · 187ffc2
1 parent e4f937e
commit 187ffc2
Showing 1 changed file with 11 additions and 19 deletions.
diff --git a/goreleaser.yml → goreleaser.yaml b/goreleaser.yml → goreleaser.yaml
@@ -27,44 +27,36 @@ dockers:
     goarch: amd64
     image_templates:
       - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:canary-amd64"
-      - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:{{ .Version }}-amd64"
-      - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:{{ .Major }}-amd64"
-      - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:{{ .Major }}.{{ .Minor }}-amd64"
+      - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:v{{ .Version }}-amd64"
     build_flag_templates:
       - "--platform=linux/amd64"
       - "--label=org.opencontainers.image.created={{.Date}}"
       - "--label=org.opencontainers.image.title={{.ProjectName}}"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
-      - "--label=org.opencontainers.image.version={{.Version}}"
+      - "--label=org.opencontainers.image.version=v{{.Version}}"
   - use: buildx
     goos: linux
     goarch: arm64
     image_templates:
       - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:canary-arm64"
-      - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:{{ .Version }}-arm64"
-      - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:{{ .Major }}-arm64"
-      - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:{{ .Major }}.{{ .Minor }}-arm64"
+      - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:v{{ .Version }}-arm64"
     build_flag_templates:
       - "--platform=linux/arm64"
       - "--label=org.opencontainers.image.created={{.Date}}"
       - "--label=org.opencontainers.image.title={{.ProjectName}}"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
-      - "--label=org.opencontainers.image.version={{.Version}}"
+      - "--label=org.opencontainers.image.version=v{{.Version}}"
 
 docker_manifests:
+  - name_template: "{{ .Env.REGISTRY }}/{{ .ProjectName }}:v{{ .Major }}"
+    image_templates:
+      - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:v{{ .Major }}-amd64"
+      - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:v{{ .Major }}-arm64"
   - name_template: "{{ .Env.REGISTRY }}/{{ .ProjectName }}:canary"
     image_templates:
       - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:canary-amd64"
       - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:canary-arm64"
-  - name_template: "{{ .Env.REGISTRY }}/{{ .ProjectName }}:{{ .Version }}"
-    image_templates:
-      - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:{{ .Version }}-amd64"
-      - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:{{ .Version }}-arm64"
-  - name_template: "{{ .Env.REGISTRY }}/{{ .ProjectName }}:{{ .Major }}"
-    image_templates:
-      - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:{{ .Major }}-amd64"
-      - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:{{ .Major }}-arm64"
-  - name_template: "{{ .Env.REGISTRY }}/{{ .ProjectName }}:{{ .Major }}.{{ .Minor }}"
+  - name_template: "{{ .Env.REGISTRY }}/{{ .ProjectName }}:v{{ .Version }}"
     image_templates:
-      - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:{{ .Major }}.{{ .Minor }}-amd64"
-      - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:{{ .Major }}.{{ .Minor }}-arm64"
+      - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:v{{ .Version }}-amd64"
+      - "{{ .Env.REGISTRY }}/{{ .ProjectName }}:v{{ .Version }}-arm64"