revert 342558e3e6
revert Update .gitea/workflows/docker-build-and-push.yaml
This commit is contained in:
@@ -54,7 +54,7 @@ jobs:
|
|||||||
url: https://vault.project-quest-dev.com
|
url: https://vault.project-quest-dev.com
|
||||||
token: ${{ secrets.VAULT_TOKEN }}
|
token: ${{ secrets.VAULT_TOKEN }}
|
||||||
secrets: |
|
secrets: |
|
||||||
${{ inputs.VAULT_SECRETS_PATH }} * ;
|
${{ inputs.VAULT_SECRETS_PATH }} * | BUILD_SECRETS_RAW ;
|
||||||
|
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
@@ -94,7 +94,8 @@ jobs:
|
|||||||
# Убираем пробелы
|
# Убираем пробелы
|
||||||
arg_name=$(echo "$arg_name" | xargs)
|
arg_name=$(echo "$arg_name" | xargs)
|
||||||
|
|
||||||
# Получаем значение из environment (импортировано из Vault)
|
# Получаем значение из импортированных секретов
|
||||||
|
# В Vault Action каждый ключ экспортируется как отдельная env переменная
|
||||||
arg_value=$(printenv "$arg_name" || echo "")
|
arg_value=$(printenv "$arg_name" || echo "")
|
||||||
|
|
||||||
if [ -n "$arg_value" ]; then
|
if [ -n "$arg_value" ]; then
|
||||||
@@ -106,7 +107,7 @@ jobs:
|
|||||||
done
|
done
|
||||||
|
|
||||||
echo "BUILD_ARGS_FLAGS=$BUILD_ARGS_FLAGS" >> $GITHUB_ENV
|
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
|
- name: Login to Docker registry
|
||||||
uses: docker/login-action@v2
|
uses: docker/login-action@v2
|
||||||
@@ -119,7 +120,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
docker build \
|
docker build \
|
||||||
--build-arg SUBMODULE_TOKEN=${{ env.NPM_TOKEN }} \
|
--build-arg SUBMODULE_TOKEN=${{ env.NPM_TOKEN }} \
|
||||||
${BUILD_ARGS_FLAGS} \
|
$BUILD_ARGS_FLAGS \
|
||||||
-f ${{ inputs.DOCKERFILE_PATH }} \
|
-f ${{ inputs.DOCKERFILE_PATH }} \
|
||||||
-t ${{ inputs.REGISTRY }}/${{ inputs.USER_FOR_IMAGE_STORE }}/${{ inputs.APP_NAME }}:${{ env.VERSION }} \
|
-t ${{ inputs.REGISTRY }}/${{ inputs.USER_FOR_IMAGE_STORE }}/${{ inputs.APP_NAME }}:${{ env.VERSION }} \
|
||||||
.
|
.
|
||||||
|
|||||||
Reference in New Issue
Block a user