From f5a05ea50f20a002e1c45975a70cf6d07c2fa1d2 Mon Sep 17 00:00:00 2001
From: ypoplavs <yulia.poplavska@kubeshop.io>
Date: Mon, 3 Jun 2024 11:36:17 +0300
Subject: [PATCH] fixes

---
 .github/workflows/docker-build-release.yaml                  | 2 +-
 .../.goreleaser-docker-build-executor-gradle.yml             | 1 -
 .../.goreleaser-docker-build-executor-jmeterd.yml            | 1 -
 .../.goreleaser-docker-build-executor-playwright.yml         | 1 -
 .../.goreleaser-docker-build-executor-postman-node21.yml     | 1 -
 goreleaser_files/.goreleaser-docker-build-testworkflow.yml   | 5 +----
 6 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker-build-release.yaml b/.github/workflows/docker-build-release.yaml
index 10af2d01ff5..1add9c3b761 100644
--- a/.github/workflows/docker-build-release.yaml
+++ b/.github/workflows/docker-build-release.yaml
@@ -199,7 +199,7 @@ jobs:
           DOCKER_BUILDX_CACHE_TO: "type=gha,mode=max"
           ALPINE_IMAGE: ${{ env.ALPINE_IMAGE }}
           BUSYBOX_IMAGE: ${{ env.BUSYBOX_IMAGE }}
-          DOCKER_IMAGE_TAG: ${{ steps.commit.outputs.short }}
+          IMAGE_TAG_SHA: true
           SERVICE: ${{ matrix.service }}
 
       - name: Push Docker images
diff --git a/goreleaser_files/.goreleaser-docker-build-executor-gradle.yml b/goreleaser_files/.goreleaser-docker-build-executor-gradle.yml
index 96acb8cf574..598ddae79da 100644
--- a/goreleaser_files/.goreleaser-docker-build-executor-gradle.yml
+++ b/goreleaser_files/.goreleaser-docker-build-executor-gradle.yml
@@ -131,7 +131,6 @@ dockers:
       - "--platform=linux/amd64"
       - "--label=org.opencontainers.image.title={{ .Env.DOCKER_IMAGE_TITLE }}"
       - "--label=org.opencontainers.image.url={{ .Env.DOCKER_IMAGE_URL }}"
-      - "--label=org.opencontainers.image.title={{ .ProjectName }}"
       - "--label=org.opencontainers.image.created={{ .Date}}"
       - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
       - "--builder={{ .Env.DOCKER_BUILDX_BUILDER }}"
diff --git a/goreleaser_files/.goreleaser-docker-build-executor-jmeterd.yml b/goreleaser_files/.goreleaser-docker-build-executor-jmeterd.yml
index fd07dd39f7c..f5b69022dc2 100644
--- a/goreleaser_files/.goreleaser-docker-build-executor-jmeterd.yml
+++ b/goreleaser_files/.goreleaser-docker-build-executor-jmeterd.yml
@@ -41,7 +41,6 @@ dockers:
       - "--platform=linux/amd64"
       - "--label=org.opencontainers.image.title={{ .Env.DOCKER_IMAGE_TITLE }}"
       - "--label=org.opencontainers.image.url={{ .Env.DOCKER_IMAGE_URL }}"
-      - "--label=org.opencontainers.image.title={{ .ProjectName }}"
       - "--label=org.opencontainers.image.created={{ .Date}}"
       - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
       - "--label=org.opencontainers.image.version={{ .Version }}"
diff --git a/goreleaser_files/.goreleaser-docker-build-executor-playwright.yml b/goreleaser_files/.goreleaser-docker-build-executor-playwright.yml
index 7bd40396bd9..dea9dc63049 100644
--- a/goreleaser_files/.goreleaser-docker-build-executor-playwright.yml
+++ b/goreleaser_files/.goreleaser-docker-build-executor-playwright.yml
@@ -71,7 +71,6 @@ dockers:
       - "--platform=linux/amd64"
       - "--label=org.opencontainers.image.title={{ .Env.DOCKER_IMAGE_TITLE }}"
       - "--label=org.opencontainers.image.url={{ .Env.DOCKER_IMAGE_URL }}"
-      - "--label=org.opencontainers.image.title={{ .ProjectName }}"
       - "--label=org.opencontainers.image.created={{ .Date}}"
       - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
       - "--builder={{ .Env.DOCKER_BUILDX_BUILDER }}"
diff --git a/goreleaser_files/.goreleaser-docker-build-executor-postman-node21.yml b/goreleaser_files/.goreleaser-docker-build-executor-postman-node21.yml
index 4dd96c48475..555d9ca1570 100644
--- a/goreleaser_files/.goreleaser-docker-build-executor-postman-node21.yml
+++ b/goreleaser_files/.goreleaser-docker-build-executor-postman-node21.yml
@@ -42,7 +42,6 @@ dockers:
       - "--platform=linux/amd64"
       - "--label=org.opencontainers.image.title={{ .Env.DOCKER_IMAGE_TITLE }}"
       - "--label=org.opencontainers.image.url={{ .Env.DOCKER_IMAGE_URL }}"
-      - "--label=org.opencontainers.image.title={{ .ProjectName }}"
       - "--label=org.opencontainers.image.created={{ .Date}}"
       - "--label=org.opencontainers.image.revision={{ .FullCommit }}"
       - "--label=org.opencontainers.image.version={{ .Version }}"
diff --git a/goreleaser_files/.goreleaser-docker-build-testworkflow.yml b/goreleaser_files/.goreleaser-docker-build-testworkflow.yml
index 7b1421ea054..1b3acc9f08d 100644
--- a/goreleaser_files/.goreleaser-docker-build-testworkflow.yml
+++ b/goreleaser_files/.goreleaser-docker-build-testworkflow.yml
@@ -93,7 +93,4 @@ docker_signs:
     args:
       - "sign"
       - "${artifact}"
-      - "--yes"
-
-snapshot:
-  name_template: "{{ .ShortCommit }}"
+      - "--yes"
\ No newline at end of file