From d79ff7ea731eeef5a150dc0a8ddfbcfe494d325b Mon Sep 17 00:00:00 2001 From: Alex Shevchuk Date: Tue, 19 Aug 2025 20:32:48 +0300 Subject: [PATCH] =?UTF-8?q?53=20=D1=8D=D1=82=D0=BE=20=D0=A1=D0=B0=D0=BD?= =?UTF-8?q?=D0=BA=D1=82=20=D0=9F=D0=B5=D1=82=D0=B5=D1=80=D0=B1=D1=83=D1=80?= =?UTF-8?q?=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/deploy_staging.yaml | 4 +++- cmd/main.go | 14 ++++++++++++++ docker-compose.staging.yaml | 4 ++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy_staging.yaml b/.gitea/workflows/deploy_staging.yaml index 6263435..bcedb55 100644 --- a/.gitea/workflows/deploy_staging.yaml +++ b/.gitea/workflows/deploy_staging.yaml @@ -34,7 +34,6 @@ jobs: uses: actions/checkout@v3 - name: Extract Git metadata - if: ${{ inputs.version == 'new' }} id: git-metadata run: | echo "GIT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT @@ -88,6 +87,9 @@ jobs: VERSION: ${{ inputs.version == 'new' && 'latest' || inputs.version }} + APP_COMMIT: ${{ steps.git-metadata.outputs.GIT_TAG != 'none' && steps.git-metadata.outputs.GIT_TAG || steps.git-metadata.outputs.GIT_SHA }} + APP_BUILD_DATE: ${{ date +"%Y-%m-%d %T %Z" }} + KEYCLOAK_BASE_URL: ${{ secrets.KEYCLOAK_BASE_URL }} KEYCLOAK_REALM: ${{ secrets.KEYCLOAK_REALM }} KEYCLOAK_CLIENT_ID: ${{ secrets.KEYCLOAK_CLIENT_ID }} diff --git a/cmd/main.go b/cmd/main.go index 4926096..d7f434d 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -25,6 +25,20 @@ var ( date string ) +func init() { + if version = os.Getenv("APP_VERSION"); version == "" { + version = "undefined" + } + + if commit = os.Getenv("APP_COMMIT"); commit == "" { + commit = "undefined" + } + + if date = os.Getenv("APP_BUILD_DATE"); date == "" { + date = "undefined" + } +} + func main() { cfg := config.MustLoad(version, commit, date) diff --git a/docker-compose.staging.yaml b/docker-compose.staging.yaml index 6a48855..aebd8c1 100644 --- a/docker-compose.staging.yaml +++ b/docker-compose.staging.yaml @@ -8,6 +8,10 @@ services: published: 8001 protocol: tcp environment: + APP_VERSION: ${VERSION:-latest} + APP_COMMIT: ${APP_COMMIT:-undefined} + APP_BUILD_DATE: ${APP_BUILD_DATE:-undefined} + KEYCLOAK_BASE_URL: ${KEYCLOAK_BASE_URL} KEYCLOAK_REALM: ${KEYCLOAK_REALM} KEYCLOAK_CLIENT_ID: ${KEYCLOAK_CLIENT_ID}