fixes

kubeshop · Jun 3, 2024 · f5a05ea · f5a05ea
1 parent c73321d
commit f5a05ea
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -93,7 +93,4 @@ docker_signs:
     args:
       - "sign"
       - "${artifact}"
-      - "--yes"
-
-snapshot:
-  name_template: "{{ .ShortCommit }}"
+      - "--yes"