Merge branch 'master' into 5.0

This commit is contained in:
Alexey Pustovalov 2021-10-06 23:30:02 +02:00
commit b860991369

View File

@ -37,7 +37,7 @@ else
VCS_REF=$MAJOR_VERSION.$MINOR_VERSION VCS_REF=$MAJOR_VERSION.$MINOR_VERSION
fi fi
docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile . DOCKER_BUILDKIT=1 docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile .
if [ "$type" != "build" ]; then if [ "$type" != "build" ]; then
links="" links=""