Merge various changes with Zabbix 7.2 branch

This commit is contained in:
Alexey Pustovalov 2024-12-25 01:29:57 +09:00
parent 8257994171
commit 11fbb299b5
11 changed files with 7 additions and 16 deletions

View File

@ -645,8 +645,8 @@ jobs:
with:
context: ${{ format('{0}/{1}/{2}/', env.DOCKERFILES_DIRECTORY, matrix.build, matrix.os) }}
build-contexts: |
config_templates=./config_templates/
sources=./sources/
config_templates=./config_templates/
file: ${{ format('{0}/{1}/{2}/Dockerfile', env.DOCKERFILES_DIRECTORY, matrix.build, matrix.os) }}
platforms: ${{ steps.platform.outputs.list }}
push: true

View File

@ -412,8 +412,8 @@ jobs:
build-args: BUILD_BASE_IMAGE=${{ steps.base_build.outputs.base_build_image }}
extra-args: |
--iidfile=${{ github.workspace }}/iidfile
--build-context config_templates=./config_templates/
--build-context sources=./sources/
--build-context config_templates=./config_templates/
- name: Prepare image metadata
id: image_metadata

View File

@ -13,7 +13,7 @@ on:
- cron: '39 3 * * 2'
push:
branches:
- '7.0'
- '7.2'
# Declare default permissions as read only.
permissions: read-all

View File

@ -30,9 +30,9 @@ name: SonarCloud analysis
on:
push:
branches: [ "7.0" ]
branches: [ "7.2" ]
pull_request:
branches: [ "7.0" ]
branches: [ "7.2" ]
workflow_dispatch:
permissions:

View File

@ -45,14 +45,9 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_
RUN --mount=type=cache,target=/root/.cache/go-build/ \
--mount=type=cache,target=/root/go/ \
<<<<<<< HEAD
--mount=type=bind,source=src/,target=/tmp/src \
--mount=from=sources,target=/tmp/src \
--mount=type=bind,source=patches/,target=/tmp/patches \
--mount=from=config_templates,target=/tmp/conf \
=======
--mount=from=sources,target=/tmp/src \
--mount=type=bind,source=conf/chromedp_no_sandbox.patch,target=/tmp/chromedp_no_sandbox.patch \
>>>>>>> b0f7df6f6 (Move sources directory and introduce additional build context)
set -eux && \
cd /tmp/ && \
mkdir -p ${ZBX_OUTPUT_DIR}/agent/sbin/ && \

View File

@ -179,7 +179,6 @@ check_variables_postgresql() {
if [ -n "${DB_SERVER_HOST}" ]; then
psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}"
else
DB_SERVER_HOST='""'
psql_connect_args="--port ${DB_SERVER_PORT}"
fi
}

View File

@ -179,7 +179,6 @@ check_variables_postgresql() {
if [ -n "${DB_SERVER_HOST}" ]; then
psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}"
else
DB_SERVER_HOST='""'
psql_connect_args="--port ${DB_SERVER_PORT}"
fi
}

View File

@ -179,7 +179,6 @@ check_variables_postgresql() {
if [ -n "${DB_SERVER_HOST}" ]; then
psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}"
else
DB_SERVER_HOST='""'
psql_connect_args="--port ${DB_SERVER_PORT}"
fi
}

View File

@ -179,7 +179,6 @@ check_variables_postgresql() {
if [ -n "${DB_SERVER_HOST}" ]; then
psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}"
else
DB_SERVER_HOST='""'
psql_connect_args="--port ${DB_SERVER_PORT}"
fi
}

View File

@ -179,7 +179,6 @@ check_variables_postgresql() {
if [ -n "${DB_SERVER_HOST}" ]; then
psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}"
else
DB_SERVER_HOST='""'
psql_connect_args="--port ${DB_SERVER_PORT}"
fi
}

View File

@ -96,6 +96,7 @@ services:
# - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro
# - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro
# - ${ENV_VARS_DIRECTORY}/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro
# - pgsql_socket:/var/run/postgresql
command: init_db_only
env_file:
- ${ENV_VARS_DIRECTORY}/.env_db_pgsql