From 61aae10c20819928302d5ab57fca3c1220532aca Mon Sep 17 00:00:00 2001
From: SG <sg@exocortex.ru>
Date: Tue, 31 Mar 2026 15:54:05 +0300
Subject: [PATCH] Updates

---
 docker-build-push/build.sh |  9 +++++----
 docker-build-push/push.sh  | 27 +++++++++------------------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/docker-build-push/build.sh b/docker-build-push/build.sh
index 6059c22..2768dd9 100755
--- a/docker-build-push/build.sh
+++ b/docker-build-push/build.sh
@@ -14,6 +14,7 @@ set -euo pipefail
 : "${INPUT_CONTEXT:?missing INPUT_CONTEXT}"
 : "${INPUT_DOCKERFILE:?missing INPUT_DOCKERFILE}"
 
+
 case "${INPUT_IMAGE_NAME}" in
   */*) ;;
   *)
@@ -32,6 +33,8 @@ esac
 workdir="${PWD}/repo"
 local_image="localbuild:${INPUT_IMAGE_TAG}"
 remote_image="${INPUT_REGISTRY}/${INPUT_IMAGE_NAME}:${INPUT_IMAGE_TAG}"
+remote_image_sha="${INPUT_REGISTRY}/${INPUT_IMAGE_NAME}:${sha_tag}"
+remote_image_latest="${INPUT_REGISTRY}/${INPUT_IMAGE_NAME}:${latest_tag}"
 
 rm -rf "${workdir}"
 mkdir -p "${workdir}"
@@ -45,9 +48,7 @@ git checkout --detach FETCH_HEAD
 
 docker build \
   -f "${INPUT_DOCKERFILE}" \
+  --label "org.opencontainers.image.revision=${INPUT_GIT_SHA}" \
+  --label "org.opencontainers.image.source=${INPUT_GIT_SERVER_URL}/${INPUT_GIT_REPOSITORY}" \
   -t "${local_image}" \
   "${INPUT_CONTEXT}"
-
-echo "${INPUT_REGISTRY_TOKEN}" | docker login "${INPUT_REGISTRY}" -u "${INPUT_REGISTRY_USER}" --password-stdin
-docker tag "${local_image}" "${remote_image}"
-docker push "${remote_image}"
diff --git a/docker-build-push/push.sh b/docker-build-push/push.sh
index 0c79e23..3edbf3a 100755
--- a/docker-build-push/push.sh
+++ b/docker-build-push/push.sh
@@ -14,6 +14,7 @@ set -euo pipefail
 : "${INPUT_CONTEXT:?missing INPUT_CONTEXT}"
 : "${INPUT_DOCKERFILE:?missing INPUT_DOCKERFILE}"
 
+
 case "${INPUT_IMAGE_NAME}" in
   */*) ;;
   *)
@@ -30,24 +31,14 @@ case "${INPUT_IMAGE_NAME}" in
 esac
 
 workdir="${PWD}/repo"
+sha_tag="${INPUT_GIT_SHA}"
+latest_tag="latest"
 local_image="localbuild:${INPUT_IMAGE_TAG}"
 remote_image="${INPUT_REGISTRY}/${INPUT_IMAGE_NAME}:${INPUT_IMAGE_TAG}"
-
-#rm -rf "${workdir}"
-#mkdir -p "${workdir}"
-#
-#git init "${workdir}"
-#cd "${workdir}"
-#git remote add origin "${INPUT_GIT_SERVER_URL}/${INPUT_GIT_REPOSITORY}.git"
-#git config http.extraHeader "Authorization: Basic $(printf '%s:%s' "${INPUT_GIT_USER}" "${INPUT_GIT_TOKEN}" | base64 -w0)"
-#git fetch --depth=1 origin "${INPUT_GIT_SHA}"
-#git checkout --detach FETCH_HEAD
-
-#docker build \
-#  -f "${INPUT_DOCKERFILE}" \
-#  -t "${local_image}" \
-#  "${INPUT_CONTEXT}"
-
+remote_image_sha="${INPUT_REGISTRY}/${INPUT_IMAGE_NAME}:${sha_tag}"
+remote_image_latest="${INPUT_REGISTRY}/${INPUT_IMAGE_NAME}:${latest_tag}"
 echo "${INPUT_REGISTRY_TOKEN}" | docker login "${INPUT_REGISTRY}" -u "${INPUT_REGISTRY_USER}" --password-stdin
-docker tag "${local_image}" "${remote_image}"
-docker push "${remote_image}"
+docker tag "${local_image}" "${remote_image_sha}"
+docker tag "${local_image}" "${remote_image_latest}"
+docker push "${remote_image_sha}"
+docker push "${remote_image_latest}"