From b0e39c1a849448316c2e0f734e2adc894a9666e4 Mon Sep 17 00:00:00 2001
From: Igor Lazarev <strider2038@yandex.ru>
Date: Wed, 30 Nov 2022 05:57:37 +0300
Subject: [PATCH] fix: docker semver tags

---
 .github/workflows/release-docker.yml | 8 ++++++--
 Dockerfile                           | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml
index 3931d38..a69e3ec 100644
--- a/.github/workflows/release-docker.yml
+++ b/.github/workflows/release-docker.yml
@@ -20,6 +20,9 @@ jobs:
             type=schedule
             type=ref,event=branch
             type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
             type=sha
       - name: Set APP_VERSION env
         run: echo "APP_VERSION=$(echo ${GITHUB_REF} | rev | cut -d'/' -f 1 | rev )" >> $GITHUB_ENV
@@ -32,7 +35,8 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Login to DockerHub
-        uses: docker/login-action@v2 
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -41,7 +45,7 @@ jobs:
         with:
           context: .
           platforms: linux/amd64,linux/arm64
-          push: true
+          push: ${{ github.event_name != 'pull_request' }}
           pull: true
           build-args: |
             APP_VERSION=${{ env.APP_VERSION }}
diff --git a/Dockerfile b/Dockerfile
index ee8013a..0c2df0e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,8 @@ FROM --platform=$BUILDPLATFORM golang:alpine AS build-env
 
 ARG APP_VERSION=""
 ARG BUILD_TIME=""
-ARG TARGETOS TARGETARCH
+ARG TARGETOS
+ARG TARGETARCH
 
 ADD . /project