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

@ -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/ && \