Merge branch 'master' into 5.0

This commit is contained in:
Alexey Pustovalov
2021-06-10 14:08:26 -04:00
64 changed files with 583 additions and 460 deletions

View File

@ -108,7 +108,7 @@ RUN set -eux && \
git \
unixODBC-devel && \
cd /tmp/ && \
git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
cd /tmp/zabbix-${ZBX_VERSION} && \
zabbix_revision=`git rev-parse --short HEAD` && \
sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \