mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2024-11-30 03:33:09 +01:00
Merge branch 'master' into 4.0
This commit is contained in:
commit
67bf17ea06
2
build.sh
2
build.sh
@ -29,7 +29,7 @@ if [[ ! $version =~ ^[0-9]*\.[0-9]*\.[0-9]*$ ]] && [ "$version" != "latest" ]; t
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$version" != "latest" ]; then
|
if [ "$version" != "latest" ]; then
|
||||||
VCS_REF=`git ls-remote https://git.zabbix.com/scm/zbx/zabbix.git refs/tags/4.2.3 | cut -c1-10`
|
VCS_REF=`git ls-remote https://git.zabbix.com/scm/zbx/zabbix.git refs/tags/$version | cut -c1-10`
|
||||||
else
|
else
|
||||||
MAJOR_VERSION=`cat Dockerfile | grep "ARG MAJOR_VERSION" | head -n1 | cut -f2 -d"="`
|
MAJOR_VERSION=`cat Dockerfile | grep "ARG MAJOR_VERSION" | head -n1 | cut -f2 -d"="`
|
||||||
MINOR_VERSION=`cat Dockerfile | grep "ARG ZBX_VERSION" | head -n1 | cut -f2 -d"."`
|
MINOR_VERSION=`cat Dockerfile | grep "ARG ZBX_VERSION" | head -n1 | cut -f2 -d"."`
|
||||||
|
Loading…
Reference in New Issue
Block a user