From d1e70af74d0f9cf9cdaf6002fee09fe02919c621 Mon Sep 17 00:00:00 2001 From: "Greedy.Death" Date: Tue, 25 Nov 2025 06:12:31 +0000 Subject: [PATCH] revert 342558e3e6e1db4c82b6a47d3914174acb050c53 revert Update .gitea/workflows/docker-build-and-push.yaml --- .gitea/workflows/docker-build-and-push.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/docker-build-and-push.yaml b/.gitea/workflows/docker-build-and-push.yaml index 8348913..27447b2 100644 --- a/.gitea/workflows/docker-build-and-push.yaml +++ b/.gitea/workflows/docker-build-and-push.yaml @@ -54,7 +54,7 @@ jobs: url: https://vault.project-quest-dev.com token: ${{ secrets.VAULT_TOKEN }} secrets: | - ${{ inputs.VAULT_SECRETS_PATH }} * ; + ${{ inputs.VAULT_SECRETS_PATH }} * | BUILD_SECRETS_RAW ; - name: Checkout code uses: actions/checkout@v4 @@ -94,7 +94,8 @@ jobs: # Убираем пробелы arg_name=$(echo "$arg_name" | xargs) - # Получаем значение из environment (импортировано из Vault) + # Получаем значение из импортированных секретов + # В Vault Action каждый ключ экспортируется как отдельная env переменная arg_value=$(printenv "$arg_name" || echo "") if [ -n "$arg_value" ]; then @@ -106,7 +107,7 @@ jobs: done echo "BUILD_ARGS_FLAGS=$BUILD_ARGS_FLAGS" >> $GITHUB_ENV - echo "Build args prepared: $BUILD_ARGS_FLAGS" + echo "Build args flags: $BUILD_ARGS_FLAGS" - name: Login to Docker registry uses: docker/login-action@v2 @@ -119,7 +120,7 @@ jobs: run: | docker build \ --build-arg SUBMODULE_TOKEN=${{ env.NPM_TOKEN }} \ - ${BUILD_ARGS_FLAGS} \ + $BUILD_ARGS_FLAGS \ -f ${{ inputs.DOCKERFILE_PATH }} \ -t ${{ inputs.REGISTRY }}/${{ inputs.USER_FOR_IMAGE_STORE }}/${{ inputs.APP_NAME }}:${{ env.VERSION }} \ .