From 7867fd8eed9c492e2b62895505edc1ecb8dd1a81 Mon Sep 17 00:00:00 2001
From: subochev <caffeine.mgn@gmail.com>
Date: Mon, 19 May 2025 03:14:17 +0300
Subject: [PATCH] fix

---
 .gitea/workflows/gradle-build.yaml | 47 ------------------------------
 build-gradle/action.yml            | 11 ++++---
 2 files changed, 7 insertions(+), 51 deletions(-)
 delete mode 100644 .gitea/workflows/gradle-build.yaml

diff --git a/.gitea/workflows/gradle-build.yaml b/.gitea/workflows/gradle-build.yaml
deleted file mode 100644
index 2121583..0000000
--- a/.gitea/workflows/gradle-build.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: "Build gradle"
-description: Build docker image with docker
-
-inputs:
-  image_name:
-    description: Name of image
-    required: true
-
-jobs:
-  gradle-build:
-    steps:
-      - name: Setup Jvm
-        uses: actions/setup-java@v1
-        with:
-          java-version: 21
-          distribution: "adopt"
-      - name: "Building"
-        env:
-          HELM_REPOSITORY: ${{ vars.HELM_REPOSITORY }}
-          DOCKER_REGISTRY_USERNAME: ${{ vars.DOCKER_REGISTRY_USERNAME }}
-          DOCKER_REGISTRY_PASSWORD: ${{ vars.DOCKER_REGISTRY_PASSWORD }}
-          DOCKER_IMAGE_NAME: ${{ vars.DOCKER_REGISTRY_HOST  }}/${{ inputs.image_name }}:${{ gitea.ref_name }}
-          DOCKER_REGISTRY_HOST: ${{ vars.DOCKER_REGISTRY_HOST  }}
-          DOCKER_HOST: unix:///run/podman/podman.sock
-        run: "./gradlew -Pversion=${{ gitea.ref_name }} shadowJar -Dorg.gradle.jvmargs=-Xmx4096M --parallel --no-daemon --no-watch-fs --stacktrace"
-      - name: Log in to Repository
-        uses: redhat-actions/podman-login@v1
-        with:
-          registry: ${{ vars.DOCKER_REGISTRY_HOST  }}
-          username: ${{ vars.DOCKER_REGISTRY_USERNAME }}
-          password: ${{ vars.DOCKER_REGISTRY_PASSWORD }}
-      - name: Buildah Action
-        uses: redhat-actions/buildah-build@v2
-        with:
-          image: ${{ vars.DOCKER_REGISTRY_HOST  }}/${{ inputs.image_name }}
-          tags: ${{ gitea.ref_name }}
-          oci: true
-          containerfiles: |
-            ./server/Dockerfile
-      - name: Push to Repository
-        uses: redhat-actions/push-to-registry@v2
-        with:
-          image: ${{ vars.DOCKER_REGISTRY_HOST  }}/${{ inputs.image_name }}
-          tags: ${{ gitea.ref_name }}
-          registry: ${{ vars.DOCKER_REGISTRY_HOST  }}
-          username: ${{ vars.DOCKER_REGISTRY_USERNAME }}
-          password: ${{ vars.DOCKER_REGISTRY_PASSWORD }}
diff --git a/build-gradle/action.yml b/build-gradle/action.yml
index 0faa8c9..fa1804e 100644
--- a/build-gradle/action.yml
+++ b/build-gradle/action.yml
@@ -5,6 +5,9 @@ inputs:
   image_name: # id of input
     description: "Name of image"
     required: true
+  tag: # id of input
+    description: "Tag of image"
+    required: true
 # outputs:
 #   random-number:
 #     description: "Random number"
@@ -27,16 +30,16 @@ runs:
         HELM_REPOSITORY: ${{ vars.HELM_REPOSITORY }}
         DOCKER_REGISTRY_USERNAME: ${{ vars.DOCKER_REGISTRY_USERNAME }}
         DOCKER_REGISTRY_PASSWORD: ${{ vars.DOCKER_REGISTRY_PASSWORD }}
-        DOCKER_IMAGE_NAME: ${{ vars.DOCKER_REGISTRY_HOST  }}/${{ inputs.image_name }}:${{ gitea.ref_name }}
+        DOCKER_IMAGE_NAME: ${{ vars.DOCKER_REGISTRY_HOST  }}/${{ inputs.image_name }}:${{ inputs.image_name }}
         DOCKER_REGISTRY_HOST: ${{ vars.DOCKER_REGISTRY_HOST  }}
         DOCKER_HOST: unix:///run/podman/podman.sock
       shell: bash
-      run: "./gradlew -Pversion=${{ gitea.ref_name }} clean buildDockerImage -Dorg.gradle.jvmargs=-Xmx4096M --parallel --no-daemon --no-watch-fs --stacktrace"
+      run: "./gradlew -Pversion=${{ inputs.image_name }} clean buildDockerImage -Dorg.gradle.jvmargs=-Xmx4096M --parallel --no-daemon --no-watch-fs --stacktrace"
     # - name: Build Docker Image
     #   uses: redhat-actions/buildah-build@v2
     #   with:
     #     image: ${{ vars.DOCKER_REGISTRY_HOST  }}/${{ inputs.image_name }}
-    #     tags: ${{ gitea.ref_name }}
+    #     tags: ${{ inputs.image_name }}
     #     oci: true
     #     containerfiles: |
     #       ./server/Dockerfile
@@ -44,7 +47,7 @@ runs:
       uses: redhat-actions/push-to-registry@v2
       with:
         image: ${{ inputs.image_name }}
-        tags: ${{ gitea.ref_name }}
+        tags: ${{ inputs.image_name }}
         registry: ${{ vars.DOCKER_REGISTRY_HOST  }}
         username: ${{ vars.DOCKER_REGISTRY_USERNAME }}
         password: ${{ vars.DOCKER_REGISTRY_PASSWORD }}